@node-projects/web-component-designer-visualization-addons 0.1.20 → 0.1.22

package/dist/blockly/BlocklyJavascriptHelper.d.ts

@@ -1,2 +1,2 @@
 import './components/components.js';
-export declare function generateEventCodeFromBlockly(data: any): Promise<(event: Event, shadowRoot: ShadowRoot, parameters: Record<string, any>) => void>;
+export declare function generateEventCodeFromBlockly(data: any): Promise<(event: Event, shadowRoot: ShadowRoot, parameters: Record<string, any>, relativeSignalsPath: string) => void>;

package/dist/blockly/BlocklyJavascriptHelper.js

@@ -9,7 +9,7 @@ const prefix = `function extractPart(obj, propertyPath) {
     return retVal;
 }
 
-export async function run(eventData, shadowRoot, parameters) {
+export async function run(eventData, shadowRoot, parameters, relativeSignalsPath) {
 `;
 const postfix = `}`;
 export async function generateEventCodeFromBlockly(data) {
@@ -26,6 +26,8 @@ export async function generateEventCodeFromBlockly(data) {
     //@ts-ignore
     Blockly.JavaScript.addReservedWords('parameters');
     //@ts-ignore
+    Blockly.JavaScript.addReservedWords('relativeSignalsPath');
+    //@ts-ignore
     Blockly.JavaScript.addReservedWords('IOB');
     //@ts-ignore
     Blockly.JavaScript.addReservedWords('RUNTIME');

package/dist/blockly/components/GetParameter.js

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

package/dist/blockly/components/GetState.js

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

package/dist/blockly/components/SetState.js

@@ -21,6 +21,6 @@ Blockly.JavaScript['set_state'] = function (block) {
     const id = Blockly.JavaScript.valueToCode(block, 'OID', Blockly.JavaScript.ORDER_ATOMIC);
     //@ts-ignore
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
-    const code = `await IOB.setState(${id}, ${value});\n`;
+    const code = `await IOB.setState((${id}[0] === '.' ? relativeSignalsPath : '') + ${id}, ${value});\n`;
     return code;
 };

package/dist/blockly/components/components.d.ts

@@ -1,4 +1,3 @@
-import './fields/FieldObjectId.js';
 import './Console.js';
 import './Debugger.js';
 import './GetParameter.js';

package/dist/blockly/components/components.js

@@ -1,4 +1,3 @@
-import './fields/FieldObjectId.js';
 import './Console.js';
 import './Debugger.js';
 import './GetParameter.js';

package/dist/components/EventAssignment.js

@@ -300,9 +300,11 @@ export class EventAssignment extends BaseCustomWebComponentConstructorAppend {
         edt.title = "Blockly Script for '" + eventItem.name + "' of '" + this._selectedItems[0].name + "'";
         let data = this._selectedItems[0].getAttribute('@' + eventItem.name);
         let parameters = null;
+        let relativeSignalsPath = null;
         if (data) {
             const parsed = JSON.parse(data);
             parameters = parsed.parameters;
+            relativeSignalsPath = parsed.relativeSignalsPath;
             edt.load(parsed);
         }
         const result = await this._visualizationShell.openConfirmation(edt, { x: 100, y: 100, width: 700, height: 500 });
@@ -311,6 +313,9 @@ export class EventAssignment extends BaseCustomWebComponentConstructorAppend {
             if (parameters) {
                 blockObj.parameters = parameters;
             }
+            if (relativeSignalsPath) {
+                blockObj.relativeSignalsPath = relativeSignalsPath;
+            }
             this._selectedItems[0].setAttribute('@' + eventItem.name, JSON.stringify(blockObj));
             this._bindingsRefresh();
         }
@@ -323,10 +328,13 @@ export class EventAssignment extends BaseCustomWebComponentConstructorAppend {
         if (!scriptString || scriptString.startsWith('{')) {
             let script = { commands: [] };
             let parameters = null;
+            let relativeSignalsPath = null;
             if (scriptString) {
                 script = JSON.parse(scriptString);
                 //@ts-ignore
                 parameters = script.parameters;
+                //@ts-ignore
+                relativeSignalsPath = script.relativeSignalsPath;
             }
             let sc = new SimpleScriptEditor();
             sc.serviceContainer = this.selectedItems[0].serviceContainer;
@@ -345,6 +353,10 @@ export class EventAssignment extends BaseCustomWebComponentConstructorAppend {
                         //@ts-ignore
                         sc.parameters = parameters;
                     }
+                    if (relativeSignalsPath) {
+                        //@ts-ignore
+                        sc.relativeSignalsPath = relativeSignalsPath;
+                    }
                     let json = JSON.stringify(sc);
                     this.selectedItems[0].setAttribute('@' + eventItem.name, json);
                     this._bindingsRefresh();

package/dist/interfaces/IScriptMultiplexValue.d.ts

@@ -4,8 +4,10 @@ export declare class IScriptMultiplexValue {
     * property - read the value from a property of the customControl (not usable in screens)
     * event - read the value of a property of the event object
     * parameter - a parameter you hand over
+    * complexString - a string with signals (contained in {})
+    * complexSignal - read the value from a signal wich name is build here (it can contain other signals in {})
     */
-    source: 'signal' | 'property' | 'event' | 'parameter';
+    source: 'signal' | 'property' | 'event' | 'parameter' | 'complexString' | 'complexSignal';
     /**
      * Name of the ioBroker object or the property of the component or the parameter of the script
      * or for example in a event : srcElement.value to get the value of a input wich raises the event

package/dist/interfaces/IScriptMultiplexValue.js

@@ -4,6 +4,8 @@ export class IScriptMultiplexValue {
     * property - read the value from a property of the customControl (not usable in screens)
     * event - read the value of a property of the event object
     * parameter - a parameter you hand over
+    * complexString - a string with signals (contained in {})
+    * complexSignal - read the value from a signal wich name is build here (it can contain other signals in {})
     */
     source;
     /**

package/dist/scripting/ScriptSystem.d.ts

@@ -2,7 +2,7 @@ import { IScriptMultiplexValue } from "../interfaces/IScriptMultiplexValue.js";
 import { VisualisationElementScript } from "../interfaces/VisualisationElementScript.js";
 import { VisualizationHandler } from "../interfaces/VisualizationHandler.js";
 import { ScriptCommands } from "./ScriptCommands.js";
-type contextType = {
+export type contextType = {
     event: Event;
     element: Element;
     root: HTMLElement;
@@ -15,8 +15,9 @@ export declare class ScriptSystem {
     execute(scriptCommands: ScriptCommands[], outerContext: contextType): Promise<void>;
     runScriptCommand<T extends ScriptCommands>(command: T, context: contextType): Promise<void>;
     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>;
     getSignaName(name: string, outerContext: contextType): string;
     static extractPart(obj: any, propertyPath: string): any;
     assignAllScripts(source: string, javascriptCode: string, shadowRoot: ShadowRoot, instance: HTMLElement, assignExternalScript?: (element: Element, event: string, scriptData: any) => void): Promise<VisualisationElementScript>;
 }
-export {};

package/dist/scripting/ScriptSystem.js

@@ -55,15 +55,7 @@ export class ScriptSystem {
             case 'CalculateSignalValue': {
                 const formula = await this.getValue(command.formula, context);
                 const targetSignal = await this.getValue(command.targetSignal, context);
-                let parsed = parseBindingString(formula);
-                let results = await Promise.all(parsed.signals.map(x => this._visualizationHandler.getState(this.getSignaName(x, context))));
-                let nm = '';
-                for (let i = 0; i < parsed.parts.length - 1; i++) {
-                    let v = results[i].val;
-                    if (v == null)
-                        return;
-                    nm += v + parsed.parts[i + 1];
-                }
+                let nm = await this.parseStringWithValues(formula, context);
                 let result = eval(nm);
                 await this._visualizationHandler.setState(this.getSignaName(targetSignal, context), result);
                 break;
@@ -150,10 +142,46 @@ export class ScriptSystem {
                 case 'parameter': {
                     return outerContext.parameters[value.name];
                 }
+                case 'complexString': {
+                    let text = value.name;
+                    if (text != null) {
+                        return await this.parseStringWithValues(text, outerContext);
+                    }
+                    return null;
+                }
+                case 'complexSignal': {
+                    let text = value.name;
+                    if (text != null) {
+                        const signal = await this.parseStringWithValues(text, outerContext);
+                        return await this._visualizationHandler.getState(this.getSignaName(signal, outerContext));
+                    }
+                    return null;
+                }
             }
         }
         return value;
     }
+    async getStateOrFieldOrParameter(name, context) {
+        //use same shortcuts as in bindings. $ = signals object, § = access context
+        if (name[0] === '§') {
+            //@ts-ignore
+            var ctx = context;
+            return eval('ctx.' + name.substring(1));
+        }
+        return await this._visualizationHandler.getState(this.getSignaName(name, context));
+    }
+    async parseStringWithValues(text, context) {
+        const parsed = parseBindingString(text);
+        let results = await Promise.all(parsed.signals.map(x => this.getStateOrFieldOrParameter(this.getSignaName(x, context), context)));
+        let nm = '';
+        for (let i = 0; i < parsed.parts.length - 1; i++) {
+            let v = results[i].val;
+            if (v == null)
+                v = '';
+            nm += v + parsed.parts[i + 1];
+        }
+        return nm;
+    }
     getSignaName(name, outerContext) {
         if (name[0] === '.')
             return outerContext.relativeSignalsPath + name;
@@ -197,7 +225,7 @@ export class ScriptSystem {
                                 e.addEventListener(evtName, async (evt) => {
                                     if (!compiledFunc)
                                         compiledFunc = await generateEventCodeFromBlockly(scriptObj);
-                                    compiledFunc(evt, shadowRoot, scriptObj.parameters);
+                                    compiledFunc(evt, shadowRoot, scriptObj.parameters, scriptObj.relativeSignalsPath ?? '');
                                 });
                             }
                             else {

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.20",
+  "version": "0.1.22",
   "type": "module",
   "main": "./dist/index.js",
   "author": "jochen.kuehner@gmx.de",