@node-projects/web-component-designer-visualization-addons 0.1.101 → 0.1.103

package/dist/helpers/BindingsHelper.js

@@ -202,6 +202,7 @@ export class BindingsHelper {
     }
     serializeBinding(element, targetName, binding) {
         let bindingCopy = { ...binding };
+        delete bindingCopy.type;
         if (!binding.twoWay) {
             delete bindingCopy.events;
             delete bindingCopy.expressionTwoWay;
@@ -223,7 +224,7 @@ export class BindingsHelper {
         if (!needsJson && binding.target == BindingTarget.property &&
             !binding.expression && !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             if (targetName == 'textContent')
@@ -237,7 +238,7 @@ export class BindingsHelper {
             binding.expression && !binding.expression.includes("\n") && !binding.expression.includes(";") &&
             !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             if (targetName == 'textContent')
@@ -249,7 +250,7 @@ export class BindingsHelper {
         if (!needsJson && binding.target == BindingTarget.attribute &&
             !binding.expression && !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixAttribute + PropertiesHelper.camelToDashCase(targetName), (binding.twoWay ? '=' : '') + (binding.inverted ? '!' : '') + binding.signal + (!binding.twoWay && binding.signal.includes(';') ? ';' : '') + eventsString];
@@ -259,7 +260,7 @@ export class BindingsHelper {
             binding.expression && !binding.expression.includes("\n") && !binding.expression.includes(";") &&
             !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixAttribute + PropertiesHelper.camelToDashCase(targetName), (binding.twoWay ? '=' : '') + (binding.inverted ? '!' : '') + binding.signal + ';' + binding.expression + eventsString];
@@ -267,7 +268,7 @@ export class BindingsHelper {
         if (!needsJson && binding.target == BindingTarget.class &&
             !binding.expression && !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixClass + PropertiesHelper.camelToDashCase(targetName), (binding.inverted ? '!' : '') + binding.signal + (!binding.twoWay && binding.signal.includes(';') ? ';' : '') + eventsString];
@@ -277,7 +278,7 @@ export class BindingsHelper {
             binding.expression && !binding.expression.includes("\n") && !binding.expression.includes(";") &&
             !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixClass + PropertiesHelper.camelToDashCase(targetName), (binding.inverted ? '!' : '') + binding.signal + ';' + binding.expression + eventsString];
@@ -285,7 +286,7 @@ export class BindingsHelper {
         if (!needsJson && binding.target == BindingTarget.css &&
             !binding.expression && !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixCss + PropertiesHelper.camelToDashCase(targetName), (binding.inverted ? '!' : '') + binding.signal + (!binding.twoWay && binding.signal.includes(';') ? ';' : '') + eventsString];
@@ -295,7 +296,7 @@ export class BindingsHelper {
             binding.expression && !binding.expression.includes("\n") && !binding.expression.includes(";") &&
             !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixCss + PropertiesHelper.camelToDashCase(targetName), (binding.inverted ? '!' : '') + binding.signal + ';' + binding.expression + eventsString];
@@ -303,7 +304,7 @@ export class BindingsHelper {
         if (!needsJson && binding.target == BindingTarget.cssvar &&
             !binding.expression && !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixCssVar + BindingsHelper.camelToDotCase(targetName.substring(2)), (binding.inverted ? '!' : '') + binding.signal + (!binding.twoWay && binding.signal.includes(';') ? ';' : '') + eventsString];
@@ -313,7 +314,7 @@ export class BindingsHelper {
             binding.expression && !binding.expression.includes("\n") && !binding.expression.includes(";") &&
             !binding.expressionTwoWay &&
             binding.converter == null &&
-            !binding.type &&
+            //!binding.type &&
             !binding.historic &&
             !binding.writeBackSignal) {
             return [bindingPrefixCssVar + PropertiesHelper.camelToDashCase(targetName), (binding.inverted ? '!' : '') + binding.signal + ';' + binding.expression + eventsString];
@@ -330,9 +331,9 @@ export class BindingsHelper {
         if (binding.twoWay === null || binding.twoWay === false) {
             delete bindingCopy.twoWay;
         }
-        if (binding.type === null || binding.type === '') {
-            delete bindingCopy.type;
-        }
+        /*if (binding.type === null || binding.type === '') {
+          delete bindingCopy.type;
+        }*/
         delete bindingCopy.target;
         if (!binding.historic) {
             delete bindingCopy.historic;

package/dist/scripting/ScriptCommands.d.ts

@@ -1,4 +1,5 @@
-export declare type ScriptCommands = Comment | OpenScreen | OpenUrl | OpenDialog | CloseDialog | ToggleSignalValue | SetSignalValue | IncrementSignalValue | DecrementSignalValue | SetBitInSignal | ClearBitInSignal | ToggleBitInSignal | Console | CalculateSignalValue | Javascript | SetElementProperty | Delay | SwitchLanguage | Login | Logout | SubscribeSignal | UnsubscribeSignal | WriteSignalsInGroup | ClearSiganlsInGroup | Condition | Exit | Label | RunScript | Goto | CopySignalValuesFromFolder | ShowMessageBox | ExportSignalValuesAsJson | ImportSignalValuesFromJson;
+export declare type ScriptCommands = RunnableScriptCommands | Comment | Condition | Exit | Label | Goto;
+export declare type RunnableScriptCommands = OpenScreen | OpenUrl | OpenDialog | CloseDialog | ToggleSignalValue | SetSignalValue | IncrementSignalValue | DecrementSignalValue | SetBitInSignal | ClearBitInSignal | ToggleBitInSignal | Console | CalculateSignalValue | Javascript | SetElementProperty | Delay | SwitchLanguage | Login | Logout | SubscribeSignal | UnsubscribeSignal | WriteSignalsInGroup | ClearSiganlsInGroup | RunScript | CopySignalValuesFromFolder | ShowMessageBox | ExportSignalValuesAsJson | ImportSignalValuesFromJson;
 export interface Comment {
     type: 'Comment';
     comment: string;

package/dist/scripting/ScriptSystem.js

@@ -182,7 +182,9 @@ export class ScriptSystem {
             case 'SetElementProperty': {
                 //@ts-ignore
                 command = ScriptUpgrades.upgradeSetElementProperty(command);
-                const name = await this.getValue(command.name, context);
+                let name = await this.getValue(command.name, context);
+                if (name === '')
+                    name = null;
                 const value = await this.getValue(command.value, context);
                 const parentIndex = await this.getValue(command.parentIndex ?? 0, context);
                 const target = await this.getValue(command.target ?? 'property', context);
@@ -379,7 +381,9 @@ export class ScriptSystem {
         let results = await Promise.all(parsed.signals.map(x => this.getStateOrFieldOrParameter(this.getSignaName(x, context), context)));
         let nm = parsed.parts[0];
         for (let i = 0; i < parsed.parts.length - 1; i++) {
-            let v = results[i].val;
+            let v = results[i];
+            if (typeof v === 'object')
+                v = v.val;
             if (v == null)
                 v = '';
             nm += v + parsed.parts[i + 1];

package/dist/scripting/ScriptUpgrader.d.ts

@@ -1,5 +1,5 @@
 import { ScriptCommands, SetElementProperty } from "./ScriptCommands";
 export declare class ScriptUpgrades {
-    static upgradeScriptCommand(scriptCommand: ScriptCommands): SetElementProperty | import("./ScriptCommands").Comment | import("./ScriptCommands").OpenScreen | import("./ScriptCommands").OpenUrl | import("./ScriptCommands").OpenDialog | import("./ScriptCommands").CloseDialog | import("./ScriptCommands").ToggleSignalValue | import("./ScriptCommands").SetSignalValue | import("./ScriptCommands").IncrementSignalValue | import("./ScriptCommands").DecrementSignalValue | import("./ScriptCommands").SetBitInSignal | import("./ScriptCommands").ClearBitInSignal | import("./ScriptCommands").ToggleBitInSignal | import("./ScriptCommands").Console | import("./ScriptCommands").CalculateSignalValue | import("./ScriptCommands").Javascript | import("./ScriptCommands").Delay | import("./ScriptCommands").SwitchLanguage | import("./ScriptCommands").Login | import("./ScriptCommands").Logout | import("./ScriptCommands").SubscribeSignal | import("./ScriptCommands").UnsubscribeSignal | import("./ScriptCommands").WriteSignalsInGroup | import("./ScriptCommands").ClearSiganlsInGroup | import("./ScriptCommands").Condition | import("./ScriptCommands").Exit | import("./ScriptCommands").Label | import("./ScriptCommands").RunScript | import("./ScriptCommands").Goto | import("./ScriptCommands").CopySignalValuesFromFolder | import("./ScriptCommands").ShowMessageBox | import("./ScriptCommands").ExportSignalValuesAsJson | import("./ScriptCommands").ImportSignalValuesFromJson;
+    static upgradeScriptCommand(scriptCommand: ScriptCommands): import("./ScriptCommands").OpenScreen | import("./ScriptCommands").OpenUrl | import("./ScriptCommands").OpenDialog | import("./ScriptCommands").CloseDialog | import("./ScriptCommands").ToggleSignalValue | import("./ScriptCommands").SetSignalValue | import("./ScriptCommands").IncrementSignalValue | import("./ScriptCommands").DecrementSignalValue | import("./ScriptCommands").SetBitInSignal | import("./ScriptCommands").ClearBitInSignal | import("./ScriptCommands").ToggleBitInSignal | import("./ScriptCommands").Console | import("./ScriptCommands").CalculateSignalValue | import("./ScriptCommands").Javascript | SetElementProperty | import("./ScriptCommands").Delay | import("./ScriptCommands").SwitchLanguage | import("./ScriptCommands").Login | import("./ScriptCommands").Logout | import("./ScriptCommands").SubscribeSignal | import("./ScriptCommands").UnsubscribeSignal | import("./ScriptCommands").WriteSignalsInGroup | import("./ScriptCommands").ClearSiganlsInGroup | import("./ScriptCommands").RunScript | import("./ScriptCommands").CopySignalValuesFromFolder | import("./ScriptCommands").ShowMessageBox | import("./ScriptCommands").ExportSignalValuesAsJson | import("./ScriptCommands").ImportSignalValuesFromJson | import("./ScriptCommands").Comment | import("./ScriptCommands").Condition | import("./ScriptCommands").Exit | import("./ScriptCommands").Label | import("./ScriptCommands").Goto;
     static upgradeSetElementProperty(scriptCommand: SetElementProperty): SetElementProperty;
 }

package/dist/services/BindableObjectDragDropService.d.ts

@@ -3,8 +3,8 @@ import { BindingsHelper } from "../helpers/BindingsHelper.js";
 import { VisualizationHandler } from "../interfaces/VisualizationHandler.js";
 export declare class BindableObjectDragDropService implements IBindableObjectDragDropService {
     constructor(bindingsHelper: BindingsHelper, visualizationHandler: VisualizationHandler);
-    private _bindingsHelper;
-    private _visualizationHandler;
+    protected _bindingsHelper: BindingsHelper;
+    protected _visualizationHandler: VisualizationHandler;
     rectMap: Map<Element, SVGRectElement>;
     rect: SVGRectElement;
     dragEnter(designerCanvas: IDesignerCanvas, event: DragEvent, element: Element): void;

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

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

@@ -1 +0,0 @@
-export {};

package/dist/blockly/components/fields/FieldObjectId.js

@@ -1,6 +0,0 @@
-//@ts-ignore
-class FieldObjectId extends Blockly.FieldTextInput {
-}
-//@ts-ignore
-Blockly.FieldObjectId = FieldObjectId;
-export {};