@node-projects/web-component-designer-visualization-addons 0.1.42 → 0.1.44

package/dist/helpers/BindingsHelper.d.ts

@@ -28,7 +28,8 @@ export declare class IndirectSignal {
     private valueChangedCb;
     private visualizationHandler;
     private element;
-    constructor(visualizationHandler: VisualizationHandler, id: string, valueChangedCb: (value: State) => void, element: Element);
+    private relativeSignalPath;
+    constructor(visualizationHandler: VisualizationHandler, id: string, valueChangedCb: (value: State) => void, element: Element, relativeSignalPath: string);
     private parseIndirectBinding;
     handleValueChanged(value: any, index: number): void;
     dispose(): void;

package/dist/helpers/BindingsHelper.js

@@ -51,21 +51,27 @@ export class IndirectSignal {
     valueChangedCb;
     visualizationHandler;
     element;
-    constructor(visualizationHandler, id, valueChangedCb, element) {
+    relativeSignalPath;
+    constructor(visualizationHandler, id, valueChangedCb, element, relativeSignalPath) {
         this.visualizationHandler = visualizationHandler;
         this.valueChangedCb = valueChangedCb;
         this.element = element;
+        this.relativeSignalPath = relativeSignalPath;
         this.parseIndirectBinding(id);
         this.values = new Array(this.signals.length);
         for (let i = 0; i < this.signals.length; i++) {
             let cb = (id, value) => this.handleValueChanged(value.val, i);
-            this.unsubscribeList.push([cb, this.visualizationHandler.subscribeState(this.signals[i], cb, element)]);
+            this.unsubscribeList.push([cb, this.visualizationHandler.subscribeState(this.signals[i], cb)]);
         }
     }
     parseIndirectBinding(id) {
         let { parts, signals } = parseBindingString(id);
         this.parts = parts;
         this.signals = signals;
+        for (let n = 0; n < signals.length; n++) {
+            if (signals[n][0] == '.')
+                signals[n] = this.visualizationHandler.getNormalizedSignalName(signals[n], this.relativeSignalPath, this.element);
+        }
     }
     handleValueChanged(value, index) {
         this.values[index] = value;
@@ -76,6 +82,8 @@ export class IndirectSignal {
                 return;
             nm += v + this.parts[i + 1];
         }
+        if (nm[0] == '.')
+            nm = this.visualizationHandler.getNormalizedSignalName(nm, this.relativeSignalPath, this.element);
         if (this.combinedName != nm) {
             if (this.unsubscribeTargetValue) {
                 this.visualizationHandler.unsubscribeState(this.combinedName, this.unsubscribeTargetValue[0], this.unsubscribeTargetValue[1]);
@@ -83,7 +91,7 @@ export class IndirectSignal {
             if (!this.disposed) {
                 this.combinedName = nm;
                 let cb = (id, value) => this.valueChangedCb(value);
-                this.unsubscribeTargetValue = [cb, this.visualizationHandler.subscribeState(nm, cb, this.element)];
+                this.unsubscribeTargetValue = [cb, this.visualizationHandler.subscribeState(nm, cb)];
             }
         }
     }
@@ -532,7 +540,7 @@ export class BindingsHelper {
                 }
             }
             if (sng[0] === '.') {
-                signals[i] = relativeSignalPath + sng;
+                signals[i] = this._visualizationHandler.getNormalizedSignalName(sng, relativeSignalPath, element);
             }
         }
         let valuesObject = new Array(signals.length);
@@ -567,7 +575,7 @@ export class BindingsHelper {
             else if (s[0] == '$') {
                 let mS = s.substring(1);
                 if (mS[0] === '.') {
-                    mS = relativeSignalPath + mS;
+                    mS = this._visualizationHandler.getNormalizedSignalName(mS, relativeSignalPath, element);
                 }
                 this._visualizationHandler.getObject(mS).then(x => {
                     this.handleValueChanged(element, binding, x, valuesObject, i, signalVars, true);
@@ -575,7 +583,7 @@ export class BindingsHelper {
             }
             else {
                 if (s.includes('{')) {
-                    let indirectSignal = new IndirectSignal(this._visualizationHandler, s, (value) => this.handleValueChanged(element, binding, value.val, valuesObject, i, signalVars, false), element);
+                    let indirectSignal = new IndirectSignal(this._visualizationHandler, s, (value) => this.handleValueChanged(element, binding, value.val, valuesObject, i, signalVars, false), element, relativeSignalPath);
                     if (!cleanupCalls)
                         cleanupCalls = [];
                     cleanupCalls.push(() => indirectSignal.dispose());
@@ -607,7 +615,7 @@ export class BindingsHelper {
                     }
                     else {
                         const cb = (id, value) => this.handleValueChanged(element, binding, value.val, valuesObject, i, signalVars, false);
-                        unsubscribeList.push([s, cb, this._visualizationHandler.subscribeState(s, cb, element)]);
+                        unsubscribeList.push([s, cb, this._visualizationHandler.subscribeState(s, cb)]);
                         this._visualizationHandler.getState(s).then(x => this.handleValueChanged(element, binding, x?.val, valuesObject, i, signalVars, false));
                         if (binding[1].twoWay && i == 0) {
                             this.addTwoWayBinding(binding, element, v => this._visualizationHandler.setState(s, v));

package/dist/interfaces/VisualizationHandler.d.ts

@@ -12,12 +12,13 @@ export interface SignalInformation {
 }
 type StateChangeHandler = (id: string, state: State) => void;
 export interface VisualizationHandler {
+    getNormalizedSignalName(id: string, relativeSignalPath?: string, element?: Element): string;
     getState(id: string): Promise<State>;
     setState(id: string, val: State | StateValue, ack?: boolean): Promise<void>;
-    subscribeState(id: string, cb: StateChangeHandler, element: Element): any;
+    subscribeState(id: string, cb: StateChangeHandler): any;
     unsubscribeState(id: string, cb: StateChangeHandler, info: any): void;
-    getObject(id: string): Promise<Signal>;
     getHistoricData(id: string, config: any): any;
+    getObject(id: string): Promise<Signal>;
     getAllNames(type: string): any;
     getSignalInformation(signal: Signal): SignalInformation;
 }

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