@node-projects/web-component-designer-visualization-addons 0.1.33 → 0.1.35

package/dist/blockly/components/Console.js

@@ -16,7 +16,7 @@ Blockly.Blocks['console'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['console'] = function (block) {
+Blockly.JavaScript.forBlock['console'] = function (block, generator) {
     var level = block.getFieldValue('LEVEL');
     //@ts-ignore
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);

package/dist/blockly/components/Debugger.js

@@ -10,6 +10,6 @@ Blockly.Blocks['debugger'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['debugger'] = function (block) {
+Blockly.JavaScript.forBlock['debugger'] = function (block) {
     return 'debugger;\n';
 };

package/dist/blockly/components/Delay.js

@@ -12,7 +12,7 @@ Blockly.Blocks['delay'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['delay'] = function (block) {
+Blockly.JavaScript.forBlock['delay'] = function (block) {
     //@ts-ignore
     const delay = Blockly.JavaScript.valueToCode(block, 'DELAY', Blockly.JavaScript.ORDER_ATOMIC);
     let code = 'await delay(' + delay + ');\n';

package/dist/blockly/components/GetParameter.js

@@ -12,7 +12,7 @@ Blockly.Blocks['get_parameter'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['get_parameter'] = function (block, generator) {
+Blockly.JavaScript.forBlock['get_parameter'] = function (block, generator) {
     //@ts-ignore
     const name = Blockly.JavaScript.valueToCode(block, 'NAME', Blockly.JavaScript.ORDER_ATOMIC);
     const code = `context.parameters[${name}]`;

package/dist/blockly/components/GetState.js

@@ -12,7 +12,7 @@ Blockly.Blocks['get_state'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['get_state'] = function (block, generator) {
+Blockly.JavaScript.forBlock['get_state'] = function (block, generator) {
     //@ts-ignore
     const id = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     const code = `(await IOB.getState((${id}[0] === '.' ? relativeSignalsPath : '') + ${id})).val`;

package/dist/blockly/components/GetSubProperty.js

@@ -16,7 +16,7 @@ Blockly.Blocks['get_sub_property'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['get_sub_property'] = function (block, generator) {
+Blockly.JavaScript.forBlock['get_sub_property'] = function (block, generator) {
     //@ts-ignore
     const obj = Blockly.JavaScript.valueToCode(block, 'OBJECT', Blockly.JavaScript.ORDER_ATOMIC);
     //@ts-ignore

package/dist/blockly/components/OpenScreen.js

@@ -19,7 +19,7 @@ Blockly.Blocks['open_screen'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['open_screen'] = function (block) {
+Blockly.JavaScript.forBlock['open_screen'] = function (block) {
     //@ts-ignore
     const screen = Blockly.JavaScript.valueToCode(block, 'SCREEN', Blockly.JavaScript.ORDER_ATOMIC);
     //@ts-ignore

package/dist/blockly/components/QuerySelector.js

@@ -16,7 +16,7 @@ Blockly.Blocks['query_selector'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['query_selector'] = function (block, generator) {
+Blockly.JavaScript.forBlock['query_selector'] = function (block, generator) {
     var dropdown_source = block.getFieldValue('SOURCE');
     //@ts-ignore
     const selector = Blockly.JavaScript.valueToCode(block, 'SELECTOR', Blockly.JavaScript.ORDER_ATOMIC);

package/dist/blockly/components/QuerySelectorAll.js

@@ -16,7 +16,7 @@ Blockly.Blocks['query_selector_all'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['query_selector_all'] = function (block, generator) {
+Blockly.JavaScript.forBlock['query_selector_all'] = function (block, generator) {
     var dropdown_source = block.getFieldValue('SOURCE');
     //@ts-ignore
     const selector = Blockly.JavaScript.valueToCode(block, 'SELECTOR', Blockly.JavaScript.ORDER_ATOMIC);

package/dist/blockly/components/Return.js

@@ -13,7 +13,7 @@ Blockly.Blocks['return'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['return'] = function (block) {
+Blockly.JavaScript.forBlock['return'] = function (block) {
     //@ts-ignore
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
     let code = 'return ' + value + ';';

package/dist/blockly/components/SetElement.js

@@ -22,7 +22,7 @@ Blockly.Blocks['set_element'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['set_element'] = function (block) {
+Blockly.JavaScript.forBlock['set_element'] = function (block) {
     var dropdown_target = block.getFieldValue('TARGET');
     //@ts-ignore
     const element = Blockly.JavaScript.valueToCode(block, 'ELEMENT', Blockly.JavaScript.ORDER_ATOMIC);

package/dist/blockly/components/SetState.js

@@ -16,7 +16,7 @@ Blockly.Blocks['set_state'] = {
     }
 };
 //@ts-ignore
-Blockly.JavaScript['set_state'] = function (block) {
+Blockly.JavaScript.forBlock['set_state'] = function (block) {
     //@ts-ignore
     const id = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     //@ts-ignore

package/dist/blockly/components/StartEvent.js

@@ -16,7 +16,7 @@ Blockly.defineBlocksWithJsonArray([
     },
 ]);
 //@ts-ignore
-Blockly.JavaScript['start_event'] = function (block) {
+Blockly.JavaScript.forBlock['start_event'] = function (block) {
     //@ts-ignore
     let name = Blockly.JavaScript.getVariableName(block.getField('EVENTVAR').variable.name);
     return name + ' = ' + 'eventData;\n';

package/dist/scripting/ScriptSystem.d.ts

@@ -14,6 +14,7 @@ export declare class ScriptSystem {
     constructor(visualizationHandler: VisualizationHandler);
     execute(scriptCommands: ScriptCommands[], outerContext: contextType): Promise<void>;
     runScriptCommand<T extends ScriptCommands>(command: T, context: contextType): Promise<void>;
+    getTargetFromTargetSelector(context: contextType, targetSelectorTarget: 'currentScreen' | 'parentScreen' | 'currentElement' | 'parentElement', targetSelector: string): Iterable<Element>;
     getValue<T>(value: string | number | boolean | IScriptMultiplexValue, outerContext: contextType): Promise<any>;
     getStateOrFieldOrParameter(name: string, context: contextType): Promise<any>;
     parseStringWithValues(text: string, context: contextType): Promise<string>;

package/dist/scripting/ScriptSystem.js

@@ -98,16 +98,7 @@ export class ScriptSystem {
             case 'SetElementProperty': {
                 const name = await this.getValue(command.name, context);
                 const value = await this.getValue(command.value, context);
-                let host = context.element.getRootNode().host;
-                if (command.targetSelectorTarget == 'currentElement')
-                    host = context.element;
-                else if (command.targetSelectorTarget == 'parentElement')
-                    host = context.element.parentElement;
-                else if (command.targetSelectorTarget == 'parentScreen')
-                    host = host.getRootNode().host;
-                let elements = [host];
-                if (command.targetSelector)
-                    elements = host.shadowRoot.querySelectorAll(command.targetSelector);
+                let elements = this.getTargetFromTargetSelector(context, command.targetSelectorTarget, command.targetSelector);
                 for (let e of elements) {
                     if (command.target == 'attribute') {
                         e.setAttribute(name, value);
@@ -123,6 +114,19 @@ export class ScriptSystem {
             }
         }
     }
+    getTargetFromTargetSelector(context, targetSelectorTarget, targetSelector) {
+        let host = context.element.getRootNode().host;
+        if (targetSelector == 'currentElement')
+            host = context.element;
+        else if (targetSelector == 'parentElement')
+            host = context.element.parentElement;
+        else if (targetSelector == 'parentScreen')
+            host = host.getRootNode().host;
+        let elements = [host];
+        if (targetSelector)
+            elements = host.shadowRoot.querySelectorAll(targetSelector);
+        return elements;
+    }
     async getValue(value, outerContext) {
         if (typeof value === 'object') {
             switch (value.source) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "web-component-designer addon for visualizations",
   "name": "@node-projects/web-component-designer-visualization-addons",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "type": "module",
   "main": "./dist/index.js",
   "author": "jochen.kuehner@gmx.de",