x-block-lib 0.5.18 → 0.5.20

package/dist/core/blocks/common/parameter/v1/index.d.ts

@@ -3,6 +3,7 @@ type ParameterV1Type = typeof PARAMETER_V1;
 interface ParameterV1 extends ParameterV1Type {
     key: string;
     name: string;
+    locale: boolean;
 }
 export type ParameterBlockV1 = Blockly.Block & ParameterV1;
 declare const PARAMETER_V1: {
@@ -12,9 +13,10 @@ declare const PARAMETER_V1: {
     saveExtraState: (this: ParameterBlockV1) => {
         key: string;
         name: string;
+        locale: boolean;
     };
     loadExtraState: (this: ParameterBlockV1, state: any) => void;
-    setKeyName: (this: ParameterBlockV1, key: string, name: string) => void;
+    setKeyName: (this: ParameterBlockV1, key: string, name: string, locale: boolean) => void;
     onchange: (this: ParameterBlockV1, event: Blockly.Events.Abstract) => void;
     tryDuplicate_: (this: ParameterBlockV1, event: Blockly.Events.BlockMove) => void;
     updateShape_: (this: ParameterBlockV1) => void;

package/dist/core/utils/common/index.d.ts

@@ -4,5 +4,5 @@ export declare function genParamShadowV1(param: {
     type: 'string' | 'number' | 'boolean';
     default: unknown;
 }): Element;
-export declare function spawnParameterBlockV1(workspace: Blockly.Workspace, key: string, name: string): Blockly.Block;
-export declare function ensureParameterBlockV1s(scope: Blockly.Block, params: [string, string, string][]): void;
+export declare function spawnParameterBlockV1(workspace: Blockly.Workspace, key: string, name: string, locale: boolean): Blockly.Block;
+export declare function ensureParameterBlockV1s(scope: Blockly.Block, params: [string, string, string, boolean][]): void;

package/dist/index.js

@@ -228,25 +228,30 @@ function pe(e) {
     console.assert(!1, "invalid param type", e.type);
   return I.xml.textToDom(t);
 }
-function Ui(e, t, n) {
-  const o = `<xml><block type="parameter_v1"><mutation key="${t}" name="${n}"/></block></xml>`, i = I.xml.textToDom(o), s = cl.domToWorkspace(i, e);
-  return e.getBlockById(s[0]);
+function Ui(e, t, n, o) {
+  const i = `<xml><block type="parameter_v1"><mutation key="${t}" name="${n}" locale="${o ? "TRUE" : "FALSE"}"/></block></xml>`, s = I.xml.textToDom(i), a = cl.domToWorkspace(s, e);
+  return e.getBlockById(a[0]);
 }
 function Pe(e, t) {
   try {
     P.disable(), t.forEach((n) => {
-      var c;
-      const [o, i, s] = n, a = (c = e.getInput(o)) == null ? void 0 : c.connection;
-      if (!a)
+      var p;
+      const [o, i, s, a] = n, l = (p = e.getInput(o)) == null ? void 0 : p.connection;
+      if (!l)
         return;
-      let l = a.targetBlock();
-      if (l) {
-        const p = l;
-        if (p && p.key === i && p.name === s)
+      let c = l.targetBlock();
+      if (c) {
+        const _ = c;
+        if (_ && _.key === i && _.name === s)
           return;
-        l.dispose();
+        c.dispose();
       }
-      l = Ui(e.workspace, i, s), l.outputConnection.connect(a);
+      c = Ui(
+        e.workspace,
+        i,
+        s,
+        a
+      ), c.outputConnection.connect(l);
     });
   } finally {
     P.enable();
@@ -299,7 +304,7 @@ const wl = I.xml, Vl = [
   },
   {
     type: "query_data_v1",
-    inputs: ["SUCCESS", "MESSAGE", "MAINDATA", "EXTRADATA"]
+    inputs: ["SUCCESS", "MESSAGE", "MAIN_DATA", "EXTRA_DATA"]
   },
   {
     type: "update_data_v1",
@@ -313,26 +318,27 @@ function Fl(e, t) {
 }
 const Yl = {
   init: function() {
-    this.key = "", this.name = "", this.appendDummyInput().appendField("", "LABEL"), this.setOutput(!0), this.setColour(220);
+    this.key = "", this.name = "", this.locale = !1, this.appendDummyInput().appendField("", "LABEL"), this.setOutput(!0), this.setColour(220);
   },
   mutationToDom: function() {
     const e = wl.createElement("mutation");
-    return e.setAttribute("key", this.key), e.setAttribute("name", this.name), e;
+    return e.setAttribute("key", this.key), e.setAttribute("name", this.name), e.setAttribute("locale", this.locale ? "TRUE" : "FALSE"), e;
   },
   domToMutation: function(e) {
-    this.key = e.getAttribute("key") ?? "", this.name = e.getAttribute("name") ?? "", this.updateShape_();
+    this.key = e.getAttribute("key") ?? "", this.name = e.getAttribute("name") ?? "", this.locale = e.getAttribute("locale") === "TRUE", this.updateShape_();
   },
   saveExtraState: function() {
     return {
       key: this.key,
-      name: this.name
+      name: this.name,
+      locale: this.locale
     };
   },
   loadExtraState: function(e) {
-    this.key = e.key ?? "", this.name = e.name ?? "", this.updateShape_();
+    this.key = e.key ?? "", this.name = e.name ?? "", this.locale = e.locale ?? !1, this.updateShape_();
   },
-  setKeyName: function(e, t) {
-    this.key = e, this.name = t, this.updateShape_();
+  setKeyName: function(e, t, n) {
+    this.key = e, this.name = t, this.locale = n, this.updateShape_();
   },
   onchange: function(e) {
     if (e.type === P.BLOCK_MOVE) {
@@ -350,7 +356,12 @@ const Yl = {
         P.disable();
         const o = (n = t.getInput(e.oldInputName)) == null ? void 0 : n.connection;
         if (o) {
-          const i = Ui(this.workspace, this.key, this.name);
+          const i = Ui(
+            this.workspace,
+            this.key,
+            this.name,
+            this.locale
+          );
           o.connect(i.outputConnection);
         }
       } finally {
@@ -358,7 +369,7 @@ const Yl = {
       }
   },
   updateShape_: function() {
-    this.name ? this.setFieldValue(g[this.name], "LABEL") : this.setFieldValue(this.key, "LABEL");
+    this.locale ? this.setFieldValue(g[this.name], "LABEL") : this.setFieldValue(this.name, "LABEL");
   }
 };
 D.parameter_v1 = Yl;
@@ -1238,8 +1249,8 @@ const W_ = {
       return;
     const e = [];
     for (let t = 0; t < this.func.outputs.length; t++) {
-      const { name: n } = this.func.outputs[t];
-      e.push(["OUTPUT" + t, n, ""]);
+      const { id: n, name: o } = this.func.outputs[t];
+      e.push(["OUTPUT" + t, `__param@${n}__`, o, !1]);
     }
     Pe(this, e);
   },
@@ -1382,8 +1393,8 @@ const j_ = {
       return;
     const e = [];
     for (let t = 0; t < this.func.outputs.length; t++) {
-      const { name: n } = this.func.outputs[t];
-      e.push(["OUTPUT" + t, n, ""]);
+      const { id: n, name: o } = this.func.outputs[t];
+      e.push(["OUTPUT" + t, `__param@${n}__`, o, !1]);
     }
     Pe(this, e);
   },
@@ -1503,7 +1514,7 @@ const X_ = {
     const e = [];
     for (let t = 0; t < this.func.inputs.length; t++) {
       const { id: n, name: o } = this.func.inputs[t];
-      e.push(["INPUT" + t, n, o]);
+      e.push(["INPUT" + t, `__param@${n}__`, o, !1]);
     }
     Pe(this, e);
   },
@@ -1658,9 +1669,9 @@ const J_ = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Pe(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS"],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE"],
-      ["DATA", "__data__", "PARAM_DATA"]
+      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
+      ["DATA", "__data__", "PARAM_DATA", !0]
     ]);
   }
 };
@@ -1979,8 +1990,8 @@ const nd = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Pe(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS"],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE"]
+      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0]
     ]);
   }
 };
@@ -2038,10 +2049,10 @@ const od = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Pe(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS"],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE"],
-      ["MAIN_DATA", "__mainData__", "PARAM_MAIN_DATA"],
-      ["EXTRA_DATA", "__extraData__", "PARAM_EXTRA_DATA"]
+      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
+      ["MAIN_DATA", "__mainData__", "PARAM_MAIN_DATA", !0],
+      ["EXTRA_DATA", "__extraData__", "PARAM_EXTRA_DATA", !0]
     ]);
   }
 };
@@ -2674,9 +2685,9 @@ const pd = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Pe(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS"],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE"],
-      ["DATA", "__data__", "PARAM_DATA"]
+      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
+      ["DATA", "__data__", "PARAM_DATA", !0]
     ]);
   }
 };
@@ -4771,10 +4782,15 @@ const Sd = {
         const t = this.args[e], n = this.getInput("ARG" + e).connection;
         let o = n.targetBlock();
         if (o)
-          o.setKeyName(t.name, "");
+          o.setKeyName(`__param@${t.id}__`, t.name, !1);
         else
           try {
-            P.disable(), o = Ui(this.workspace, t.name, ""), o.outputConnection.connect(n);
+            P.disable(), o = Ui(
+              this.workspace,
+              `__param@${t.id}__`,
+              t.name,
+              !1
+            ), o.outputConnection.connect(n);
           } finally {
             P.enable();
           }
@@ -5811,8 +5827,8 @@ const Kd = {
       return;
     const e = [];
     for (let t = 0; t < this.method.outputs.length; t++) {
-      const n = this.method.outputs[t];
-      e.push(["OUTPUT" + t, n.key, n.name]);
+      const { key: n, name: o } = this.method.outputs[t];
+      e.push(["OUTPUT" + t, `__param@${n}__`, o, !1]);
     }
     e.length > 0 && Pe(this, e);
   },
@@ -5995,8 +6011,8 @@ const Hd = {
       return;
     const e = [];
     for (let t = 0; t < this.method.outputs.length; t++) {
-      const n = this.method.outputs[t];
-      e.push(["OUTPUT" + t, n.key, n.name]);
+      const { key: n, name: o } = this.method.outputs[t];
+      e.push(["OUTPUT" + t, `__param@${n}__`, o, !1]);
     }
     e.length > 0 && Pe(this, e);
   },
@@ -6156,7 +6172,7 @@ const jd = {
     const e = [];
     for (let t = 0; t < this.method.inputs.length; t++) {
       const { id: n, name: o } = this.method.inputs[t];
-      e.push(["INPUT" + t, n, o]);
+      e.push(["INPUT" + t, `__param@${n}__`, o, !1]);
     }
     Pe(this, e);
   },
@@ -6744,7 +6760,7 @@ const oh = {
       return;
     const e = [];
     this.event.params.forEach(({ key: t, name: n }, o) => {
-      e.push(["PARAM" + o, t, n]);
+      e.push(["PARAM" + o, `__param@${t}__`, n, !1]);
     }), e.length > 0 && Pe(this, e);
   },
   checkWarning_: function() {
@@ -6878,7 +6894,7 @@ const ih = {
       return;
     const e = [];
     this.event.params.forEach(({ key: t, name: n }, o) => {
-      e.push(["PARAM" + o, n, t]);
+      e.push(["PARAM" + o, `__param@${t}__`, n, !1]);
     }), e.length > 0 && Pe(this, e);
   },
   checkWarning_: function() {
@@ -6936,10 +6952,8 @@ const sh = {
     this.getInput("TEXT").connection.setShadowDom(t);
   },
   rebuildBlocks_: function() {
-    if (this.isInsertionMarker())
-      return;
-    Pe(this, [
-      ["RESULT", "__result__", "PARAM_RESULT"]
+    this.isInsertionMarker() || Pe(this, [
+      ["RESULT", "__result__", "PARAM_RESULT", !1]
     ]);
   }
 };
@@ -6977,10 +6991,8 @@ const ah = {
     this.getInput("VALUE").connection.setShadowDom(n);
   },
   rebuildBlocks_: function() {
-    if (this.isInsertionMarker())
-      return;
-    Pe(this, [
-      ["RESULT", "__result__", "PARAM_RESULT"]
+    this.isInsertionMarker() || Pe(this, [
+      ["RESULT", "__result__", "PARAM_RESULT", !1]
     ]);
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-block-lib",
   "private": false,
-  "version": "0.5.18",
+  "version": "0.5.20",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,7 +32,7 @@
     "vue-draggable-plus": "^0.5.4",
     "vuetify": "^3.7.3",
     "x-essential-lib": "^0.7.11",
-    "x-runtime-lib": "^0.5.34",
+    "x-runtime-lib": "^0.5.35",
     "x-state-lib": "^0.1.6"
   },
   "devDependencies": {