iobroker.javascript 8.5.0 → 8.5.1

package/admin/google-blockly/own/blocks_procedures.js

@@ -13,7 +13,7 @@ if (Blockly.Blocks['procedures_ifreturn'].FUNCTION_TYPES.indexOf('procedures_def
  *     Each procedure is defined by a three-element list of name, parameter
  *     list, and return value boolean.
  */
-Blockly.Procedures.allProceduresNew = function(root) {
+Blockly.Procedures.allProceduresNew = function (root) {
     const result = Blockly.Procedures.allProcedures(root);
 
     const proceduresCustomNoReturn = root
@@ -56,7 +56,7 @@ Blockly.Procedures.allProceduresNew = function(root) {
  * @param {!Blockly.Workspace} workspace The workspace containing procedures.
  * @return {!Array.<!Element>} Array of XML block elements.
  */
-Blockly.Procedures.flyoutCategoryNew = function(workspace) {
+Blockly.Procedures.flyoutCategoryNew = function (workspace) {
     const xmlList = [];
     const utils = (Blockly.Xml.utils ? Blockly.Xml.utils : Blockly.utils.xml);
     if (Blockly.Blocks['procedures_defnoreturn']) {
@@ -171,7 +171,7 @@ Blockly.Procedures.flyoutCategoryNew = function(workspace) {
 
 // ---------------------- patch for async functions ------------------------------
 // taken from javascript/procedures.js https://github.com/google/blockly/blob/blockly-v9.3.3/generators/javascript/procedures.js
-Blockly.JavaScript.forBlock['procedures_defreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_defreturn'] = function (block) {
     // Define a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -217,7 +217,7 @@ Blockly.JavaScript.forBlock['procedures_defreturn'] = function(block) {
 
 Blockly.JavaScript.forBlock['procedures_defnoreturn'] = Blockly.JavaScript.forBlock['procedures_defreturn'];
 
-Blockly.JavaScript.forBlock['procedures_callreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_callreturn'] = function (block) {
     // Call a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -245,7 +245,7 @@ Blockly.Blocks['procedures_defcustomreturn'] = {
      * Block for defining a procedure with a return value.
      * @this Blockly.Block
      */
-    init: function() {
+    init: function () {
         const nameField = new Blockly.FieldTextInput('',
             Blockly.Procedures.rename);
 
@@ -380,7 +380,7 @@ Blockly.Blocks['procedures_defcustomreturn'] = {
      *     - that it DOES NOT have a return value.
      * @this Blockly.Block
      */
-    getProcedureDef: function() {
+    getProcedureDef: function () {
         return [this.getFieldValue('NAME'), this.arguments_, true, true];
     },
     getVars: Blockly.Blocks['procedures_defreturn'].getVars,
@@ -392,7 +392,7 @@ Blockly.Blocks['procedures_defcustomreturn'] = {
     callType_: 'procedures_callcustomreturn'
 };
 
-Blockly.JavaScript.forBlock['procedures_defcustomreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_defcustomreturn'] = function (block) {
     // Define a procedure with a return value.
     const funcName = Blockly.JavaScript.nameDB_.getName(
         block.getFieldValue('NAME'), Blockly.PROCEDURE_CATEGORY_NAME);
@@ -444,7 +444,7 @@ Blockly.Blocks['procedures_defcustomnoreturn'] = {
     isProcedureDef() {
         return true;
     },
-    init: function() {
+    init: function () {
         const nameField = new Blockly.FieldTextInput('', Blockly.Procedures.rename);
         nameField.setSpellcheck(false);
 
@@ -484,7 +484,7 @@ Blockly.Blocks['procedures_defcustomnoreturn'] = {
     domToMutation: Blockly.Blocks['procedures_defnoreturn'].domToMutation,
     decompose: Blockly.Blocks['procedures_defcustomreturn'].decompose,
     compose: Blockly.Blocks['procedures_defcustomreturn'].compose,
-    getProcedureDef: function() {
+    getProcedureDef: function () {
         return [this.getFieldValue('NAME'), this.arguments_, false, true];
     },
     getVars: Blockly.Blocks['procedures_defnoreturn'].getVars,
@@ -513,7 +513,7 @@ Blockly.Blocks['procedures_callcustomnoreturn'] = {
     defType_: 'procedures_defcustomnoreturn'
 };
 
-Blockly.JavaScript.forBlock['procedures_callcustomnoreturn'] = function(block) {
+Blockly.JavaScript.forBlock['procedures_callcustomnoreturn'] = function (block) {
     // Call a procedure with no return value.
     // Generated code is for a function call as a statement is the same as a
     // function call as a value, with the addition of line ending.

package/admin/google-blockly/own/blocks_sendto.js

@@ -2,7 +2,6 @@
 
 if (typeof goog !== 'undefined') {
     goog.provide('Blockly.JavaScript.Sendto');
-
     goog.require('Blockly.JavaScript');
 }
 
@@ -11,13 +10,13 @@ Blockly.CustomBlocks.push('Sendto');
 
 Blockly.Sendto = {
     HUE: 310,
-    blocks: {}
+    blocks: {},
 };
 
 // --- sendTo Custom --------------------------------------------------
 Blockly.Sendto.blocks['sendto_custom'] =
     '<block type="sendto_custom">' +
-    '  <mutation items="parameter1" with_statement="false"></mutation>' +
+    '  <mutation xmlns="http://www.w3.org/1999/xhtml" items="parameter"></mutation>' +
     '  <field name="INSTANCE">admin.0</field>' +
     '  <field name="COMMAND">send</field>' +
     '  <field name="LOG"></field>' +
@@ -46,7 +45,7 @@ Blockly.Blocks['sendto_custom_container'] = {
     },
 };
 
-Blockly.Blocks['sendto_custom_item'] = {
+Blockly.Blocks['sendto_custom_mutator'] = {
     /**
      * Mutator block for add items.
      * @this Blockly.Block
@@ -54,8 +53,9 @@ Blockly.Blocks['sendto_custom_item'] = {
     init: function () {
         this.setColour(Blockly.Sendto.HUE);
 
-        this.appendDummyInput('NAME')
-            .appendField(Blockly.Translate('sendto_custom_argument'));
+        this.appendDummyInput('ATTR')
+            .appendField(Blockly.Translate('sendto_custom_argument'))
+            .appendField(new Blockly.FieldTextInput('parameter'), 'ATTR');
 
         this.setPreviousStatement(true);
         this.setNextStatement(true);
@@ -81,9 +81,7 @@ Blockly.Blocks['sendto_custom'] = {
             if (!options.length) {
                 options.push([Blockly.Translate('sendto_no_instances'), '']);
             }
-            /*for (let h = 0; h < scripts.hosts.length; h++) {
-                options.push([scripts.hosts[h], scripts.hosts[h]]);
-            }*/
+
             this.appendDummyInput('INSTANCE')
                 .appendField(Blockly.Translate('sendto_custom'))
                 .appendField(new Blockly.FieldDropdown(options), 'INSTANCE');
@@ -113,15 +111,19 @@ Blockly.Blocks['sendto_custom'] = {
             .appendField(Blockly.Translate('request_statement'))
             .appendField(new Blockly.FieldCheckbox('FALSE', function (option) {
                 const withStatement = option === true || option === 'true' || option === 'TRUE';
-                this.sourceBlock_.updateShape_(this.sourceBlock_.getArgNames_(), withStatement);
+                this.sourceBlock_.updateShape_(withStatement);
             }), 'WITH_STATEMENT');
 
-        this.itemCount_ = 1;
+        this.attributes_ = [];
+        this.itemCount_ = 0;
+
+        this.setMutator(new Blockly.icons.MutatorIcon(['sendto_custom_mutator'], this));
+
         this.updateShape_();
         this.setInputsInline(false);
         this.setPreviousStatement(true, null);
         this.setNextStatement(true, null);
-        this.setMutator(new Blockly.icons.MutatorIcon(['sendto_custom_item'], this));
+
         this.setTooltip(Blockly.Translate('sendto_custom_tooltip'));
         this.setHelpUrl(getHelp('sendto_custom_help'));
     },
@@ -132,15 +134,9 @@ Blockly.Blocks['sendto_custom'] = {
      */
     mutationToDom: function () {
         const container = document.createElement('mutation');
-        const names = [];
-        for (let i = 0; i < this.itemCount_; i++) {
-            const input = this.getInput('ARG' + i);
-            names[i] = input.fieldRow[0].getValue();
-        }
 
-        container.setAttribute('items', names.join(','));
-        const withStatement = this.getFieldValue('WITH_STATEMENT');
-        container.setAttribute('with_statement', withStatement === 'TRUE' || withStatement === 'true' || withStatement === true);
+        container.setAttribute('items', this.attributes_.join(','));
+
         return container;
     },
     /**
@@ -149,10 +145,17 @@ Blockly.Blocks['sendto_custom'] = {
      * @this Blockly.Block
      */
     domToMutation: function (xmlElement) {
-        const names = xmlElement.getAttribute('items').split(',');
-        this.itemCount_ = names.length;
-        const withStatement = xmlElement.getAttribute('with_statement');
-        this.updateShape_(names, withStatement === true || withStatement === 'true' || withStatement === 'TRUE');
+        this.attributes_ = [];
+
+        const names = xmlElement.getAttribute('items');
+        if (names) {
+            for (const name of names.split(',')) {
+                this.attributes_.push(name);
+            }
+        }
+
+        this.itemCount_ = this.attributes_.length;
+        this.updateShape_();
     },
     /**
      * Populate the mutator's dialog with this block's components.
@@ -163,9 +166,11 @@ Blockly.Blocks['sendto_custom'] = {
     decompose: function (workspace) {
         const containerBlock = workspace.newBlock('sendto_custom_container');
         containerBlock.initSvg();
+
         let connection = containerBlock.getInput('STACK').connection;
         for (let i = 0; i < this.itemCount_; i++) {
-            const itemBlock = workspace.newBlock('sendto_custom_item');
+            const itemBlock = workspace.newBlock('sendto_custom_mutator');
+            itemBlock.setFieldValue(this.attributes_[i], 'ATTR');
             itemBlock.initSvg();
             connection.connect(itemBlock.previousConnection);
             connection = itemBlock.nextConnection;
@@ -178,41 +183,38 @@ Blockly.Blocks['sendto_custom'] = {
      * @this Blockly.Block
      */
     compose: function (containerBlock) {
+        this.attributes_ = [];
+
         let itemBlock = containerBlock.getInputTargetBlock('STACK');
         // Count number of inputs.
         const connections = [];
-        const names = [];
         while (itemBlock) {
+            const attrName = itemBlock.getFieldValue('ATTR');
+            this.attributes_.push(attrName);
+
             connections.push(itemBlock.valueConnection_);
             itemBlock = itemBlock.nextConnection &&
                 itemBlock.nextConnection.targetBlock();
         }
+
         // Disconnect any children that don't belong.
-        for (let i = 0; i < this.itemCount_; i++) {
-            const input = this.getInput('ARG' + i);
-            const connection = input.connection.targetConnection;
-            names[i] = input.fieldRow[0].getValue();
+        for (let k = 0; k < this.itemCount_; k++) {
+            const connection = this.getInput('ARG' + k).connection.targetConnection;
             if (connection && !connections.includes(connection)) {
                 connection.disconnect();
             }
         }
+
         this.itemCount_ = connections.length;
-        if (this.itemCount_ < 1) {
-            this.itemCount_ = 1;
+        if (this.itemCount_ < 0) {
+            this.itemCount_ = 0;
         }
-        this.updateShape_(names);
+        this.updateShape_();
+
         // Reconnect any child blocks.
-        for (let j = 0; j < this.itemCount_; j++) {
-            Blockly.icons.MutatorIcon.reconnect(connections[j], this, 'ARG' + j);
-        }
-    },
-    getArgNames_: function () {
-        const names = [];
-        for (let n = 0; n < this.itemCount_; n++) {
-            const input = this.getInput('ARG' + n);
-            names.push(input.fieldRow[0].getValue());
+        for (let i = 0; i < this.itemCount_; i++) {
+            Blockly.icons.MutatorIcon.reconnect(connections[i], this, 'ARG' + i);
         }
-        return names;
     },
     /**
      * Store pointers to any connected child blocks.
@@ -234,71 +236,42 @@ Blockly.Blocks['sendto_custom'] = {
      * @private
      * @this Blockly.Block
      */
-    updateShape_: function (names, withStatement) {
-        names = names || [];
-        let _input;
-        const wp = this.workspace;
-        if (withStatement === undefined) {
-            withStatement = this.getFieldValue('WITH_STATEMENT');
-            withStatement = withStatement === true || withStatement === 'true' || withStatement === 'TRUE';
-        }
-
-        this.getInput('STATEMENT') && this.removeInput('STATEMENT');
+    updateShape_: function (withStatement) {
+        const workspace = this.workspace;
 
         // Add new inputs.
-        let i;
-        for (i = 0; i < this.itemCount_; i++) {
-            _input = this.getInput('ARG' + i);
-
-            if (!_input) {
-                _input = this.appendValueInput('ARG' + i);
-                if (!names[i]) {
-                    names[i] = Blockly.Translate('sendto_custom_argument') + (i + 1);
-                }
-                _input.appendField(new Blockly.FieldTextInput(names[i]));
-                setTimeout(__input => {
-                    if (!__input.connection.isConnected()) {
-                        const _shadow = wp.newBlock('text');
-                        _shadow.setShadow(true);
-                        _shadow.initSvg();
-                        _shadow.render();
-                        _shadow.outputConnection.connect(__input.connection);
-                    }
-                }, 100, _input);
+        for (let i = 0; i < this.itemCount_; i++) {
+            let input = this.getInput('ARG' + i);
+
+            if (!input) {
+                input = this.appendValueInput('ARG' + i).setAlign(Blockly.ALIGN_RIGHT);
+                input.appendField(this.attributes_[i]);
             } else {
-                _input.fieldRow[0].setValue(names[i]);
-                setTimeout(__input => {
-                    if (!__input.connection.isConnected()) {
-                        const shadow = wp.newBlock('text');
-                        shadow.setShadow(true);
-                        shadow.initSvg();
-                        shadow.render();
-                        shadow.outputConnection.connect(__input.connection);
-                    }
-                }, 100, _input);
+                input.fieldRow[0].setValue(this.attributes_[i]);
             }
-        }
 
+            setTimeout(__input => {
+                if (!__input.connection.isConnected()) {
+                    const _shadow = workspace.newBlock('text');
+                    _shadow.setShadow(true);
+                    _shadow.initSvg();
+                    _shadow.render();
+                    _shadow.outputConnection.connect(__input.connection);
+                }
+            }, 100, input);
+        }
         // Remove deleted inputs.
-        const blocks = [];
-        while (_input = this.getInput('ARG' + i)) {
-            const b = _input.connection.targetBlock();
-            if (b && b.isShadow()) {
-                blocks.push(b);
-            }
+        for (let i = this.itemCount_; this.getInput('ARG' + i); i++) {
             this.removeInput('ARG' + i);
-            i++;
         }
 
-        if (blocks.length) {
-            const ws = this.workspace;
-            setTimeout(() => {
-                for (let b = 0; b < blocks.length; b++) {
-                    ws.removeTopBlock(blocks[b]);
-                }
-            }, 100);
+        if (withStatement === undefined) {
+            withStatement = this.getFieldValue('WITH_STATEMENT');
+            withStatement = withStatement === true || withStatement === 'true' || withStatement === 'TRUE';
         }
 
+        this.getInput('STATEMENT') && this.removeInput('STATEMENT');
+
         // Add or remove a statement Input.
         if (withStatement) {
             this.appendStatementInput('STATEMENT');
@@ -312,44 +285,56 @@ Blockly.JavaScript.forBlock['sendto_custom'] = function (block) {
     const command       = block.getFieldValue('COMMAND');
     const withStatement = block.getFieldValue('WITH_STATEMENT');
     const args = [];
-    let logText;
-    if (logLevel) {
-        logText = 'console.' + logLevel + '("' + instance + ': " + "' + (args.length ? args.join(',') + '\n' : '') + '");\n'
-    } else {
-        logText = '';
-    }
+
+    let logText = '';
+
     let statement;
     if (withStatement === true || withStatement === 'true' || withStatement === 'TRUE') {
         statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
     }
 
     for (let n = 0; n < block.itemCount_; n++) {
-        const input = this.getInput('ARG' + n);
+        const name = String(block.attributes_[n]);
         let val = Blockly.JavaScript.valueToCode(block, 'ARG' + n, Blockly.JavaScript.ORDER_COMMA);
-        // if JSON
-        if (val && val[0] === "'" && val[1] === '{') {
+
+        // if JSON (or object), remove quotes '{ bla: true }' -> { bla: true }
+        if (val && val.startsWith(`'{`) && val.endsWith(`}'`)) {
             val = val.substring(1, val.length - 1);
         }
-        args.push(`'${input.fieldRow[0].getValue()}': ${val}`);
 
-        if (block.itemCount_ === 1 && !input.fieldRow[0].getValue()) {
+        if (block.itemCount_ === 1 && !name) {
+            if (logLevel) {
+                logText = `console.${logLevel}('sendTo[custom] ${instance}: ' + ${val});\n`;
+            }
+
             if (statement) {
                 return `sendTo('${instance}', '${command}', ${val}, async (result) => {\n` +
                     statement +
-                    '});\n' + logText;
-            } else {
-                return `sendTo('${instance}', '${command}', ${val});\n` + logText;
+                    `});\n${logText}`;
             }
+
+            return `sendTo('${instance}', '${command}', ${val});\n${logText}`;
+        } else {
+            args.push({
+                attr: name.replaceAll(`'`, `\\'`),
+                val,
+            });
         }
     }
 
+    const argStr = (args.length ? args.map(a => Blockly.JavaScript.prefixLines(`'${a.attr}': ${a.val},`, Blockly.JavaScript.INDENT)).join('\n') : '');
+
+    if (logLevel) {
+        logText = `console.${logLevel}('sendTo[custom] ${instance}: ${args.length ? args.map(a => `${a.attr}: ' + ${a.val} + '`).join(', ') : '[no args]'}');\n`;
+    }
+
     if (statement) {
-        return `sendTo('${instance}', '${command}', { ${args.length ? args.join(', ') : ''} }, async (result) => {\n` +
+        return `sendTo('${instance}', '${command}', {\n${argStr}\n}, async (result) => {\n` +
             statement +
-            '});\n' + logText;
-    } else {
-        return `sendTo('${instance}', '${command}', { ${args.length ? args.join(', ') : ''} });\n` + logText;
+            `});\n${logText}`;
     }
+
+    return `sendTo('${instance}', '${command}', {\n${argStr}\n});\n${logText}`;
 };
 
 // --- sendTo JavaScript --------------------------------------------------
@@ -367,7 +352,7 @@ Blockly.Sendto.blocks['sendto_otherscript'] =
     '</block>';
 
 Blockly.Blocks['sendto_otherscript'] = {
-    init: function() {
+    init: function () {
         const options = [];
         if (typeof main !== 'undefined' && main.instances) {
             for (let i = 0; i < main.instances.length; i++) {
@@ -422,7 +407,7 @@ Blockly.Blocks['sendto_otherscript'] = {
     },
 };
 
-Blockly.JavaScript.forBlock['sendto_otherscript'] = function(block) {
+Blockly.JavaScript.forBlock['sendto_otherscript'] = function (block) {
     const dropdown_instance = block.getFieldValue('INSTANCE');
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const message = block.getFieldValue('MESSAGE');
@@ -478,7 +463,7 @@ Blockly.Sendto.blocks['sendto_gethistory'] =
     '</block>';
 
 Blockly.Blocks['sendto_gethistory'] = {
-    init: function() {
+    init: function () {
         const options = [
             ['default', 'default']
         ];
@@ -551,7 +536,7 @@ Blockly.Blocks['sendto_gethistory'] = {
     },
 };
 
-Blockly.JavaScript.forBlock['sendto_gethistory'] = function(block) {
+Blockly.JavaScript.forBlock['sendto_gethistory'] = function (block) {
     const dropdown_instance = block.getFieldValue('INSTANCE');
     const value_objectid = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const start = Blockly.JavaScript.valueToCode(block, 'START', Blockly.JavaScript.ORDER_ATOMIC);

package/admin/google-blockly/own/blocks_switch.js

@@ -3,7 +3,7 @@
 // Many thanks to Florian Pechwitz <florian.Pechwitz@itizzimo.com> for the code
 
 Blockly.Blocks['logic_switch_case'] = {
-    init: function() {
+    init: function () {
         this.setColour('%{BKY_LOGIC_HUE}');
         this.setPreviousStatement(true);
         this.setNextStatement(true);
@@ -36,7 +36,7 @@ Blockly.Blocks['logic_switch_case'] = {
         return container;
     },
 
-    domToMutation: function(xmlElement) {
+    domToMutation: function (xmlElement) {
         this.caseCount_    = parseInt(xmlElement.getAttribute('case'), 10);
         this.defaultCount_ = parseInt(xmlElement.getAttribute('default'), 10);
 
@@ -53,7 +53,7 @@ Blockly.Blocks['logic_switch_case'] = {
         }
     },
 
-    decompose: function(workspace) {
+    decompose: function (workspace) {
         const containerBlock = workspace.newBlock('control_case');//Blockly.Block.obtain(workspace, 'control_case');
         containerBlock.initSvg();
 
@@ -75,7 +75,7 @@ Blockly.Blocks['logic_switch_case'] = {
         return containerBlock;
     },
 
-    compose: function(containerBlock) {
+    compose: function (containerBlock) {
         //Disconnect all input blocks and remove all inputs.
         if (this.defaultCount_) {
             this.removeInput('ONDEFAULT');
@@ -129,7 +129,7 @@ Blockly.Blocks['logic_switch_case'] = {
         }
     },
 
-    saveConnections: function(containerBlock) {
+    saveConnections: function (containerBlock) {
         let caseBlock = containerBlock.getInputTargetBlock('STACK');
         let x = 1;
         while (caseBlock) {
@@ -155,7 +155,7 @@ Blockly.Blocks['logic_switch_case'] = {
 };
 
 Blockly.Blocks['control_case'] = {
-    init: function() {
+    init: function () {
         this.setColour('%{BKY_LOGIC_HUE}');
         this.appendDummyInput()
             .appendField(Blockly.Translate('logic_switch_case_is'));
@@ -166,7 +166,7 @@ Blockly.Blocks['control_case'] = {
 };
 
 Blockly.Blocks['case_incaseof'] = {
-    init: function() {
+    init: function () {
         this.setColour('%{BKY_LOGIC_HUE}');
         this.appendDummyInput()
             .appendField(Blockly.Translate('logic_switch_case_of'));
@@ -178,7 +178,7 @@ Blockly.Blocks['case_incaseof'] = {
 };
 
 Blockly.Blocks['case_default'] = {
-    init: function() {
+    init: function () {
         this.setColour('%{BKY_LOGIC_HUE}');
         this.appendDummyInput()
             .appendField('default');