Added JSONata for Object conversion

Mic-M · Mar 3, 2020 · 3840293 · 3840293
1 parent f1fb776
commit 3840293
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 1 deletion.
diff --git a/admin/google-blockly/own/blocks_convert.js b/admin/google-blockly/own/blocks_convert.js
@@ -334,3 +334,33 @@ Blockly.JavaScript.convert_object2json = function (block) {
     return ['JSON.stringify(' + Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC) + (prettify == 'TRUE' ? ', null, 2' : '') + ')', Blockly.JavaScript.ORDER_ATOMIC];
 };
 
+// --- to single value -------------------------------------------
+Blockly.Convert.blocks['convert_jsonata'] =
+    '<block type="convert_jsonata">'
+    + '     <value name="EXPRESSION">'
+    + '         <shadow type="text">'
+    + '             <field name="TEXT">*</field>'
+    + '         </shadow>'
+    + '     </value>'
+    + '     <value name="TARGET">'
+    + '     </value>'
+    + '</block>';
+
+Blockly.Blocks.convert_jsonata = {
+    init: function () {
+
+        this.appendValueInput('EXPRESSION')
+            .appendField(Blockly.Words['convert_jsonata'][systemLang]);
+
+        this.appendValueInput('TARGET')
+            .appendField(Blockly.Words['convert_jsonata_target'][systemLang]);
+
+        this.setInputsInline(true);
+        this.setColour(Blockly.Convert.HUE);
+        this.setOutput(true, 'String');
+        this.setTooltip(Blockly.Words['convert_jsonata_tooltip'][systemLang])
+    }
+};
+Blockly.JavaScript.convert_jsonata = function (block) {
+    return ['jsonataExpression(' + Blockly.JavaScript.valueToCode(block, 'TARGET', Blockly.JavaScript.ORDER_ATOMIC) + ',' + Blockly.JavaScript.valueToCode(block, 'EXPRESSION', Blockly.JavaScript.ORDER_ATOMIC) + ')', Blockly.JavaScript.ORDER_ATOMIC];
+};
diff --git a/admin/google-blockly/own/blocks_words.js b/admin/google-blockly/own/blocks_words.js
diff --git a/lib/sandbox.js b/lib/sandbox.js
@@ -42,6 +42,7 @@ function sandBox(script, name, verbose, debug, context) {
     const eventObj = require('./eventObj');
     const patternCompareFunctions = require('./patternCompareFunctions');
     const nodeSchedule = require('node-schedule');
+    const jsonata = require("jsonata");
 
     /** @type {ioBroker.Adapter} */
     const adapter  = context.adapter;
@@ -2811,6 +2812,9 @@ function sandBox(script, name, verbose, debug, context) {
             debug:  function (msg) {
                 sandbox.log(msg, 'debug');
             }
+        },
+        jsonataExpression: function (data, expression) {
+            return jsonata(expression).evaluate(data);
         }
     };
 

diff --git a/package.json b/package.json
@@ -37,7 +37,8 @@
     "suncalc2": "^1.8.1",
     "typescript": "^3.6.3",
     "virtual-tsc": "^0.5.0",
-    "wake_on_lan": "^1.0.0"
+    "wake_on_lan": "^1.0.0",
+    "jsonata": "^1.8.1"
   },
   "devDependencies": {
     "@types/iobroker": "^1.4.12",