x-block-lib 0.6.44 → 0.6.46

package/dist/index.js

@@ -3805,7 +3805,9 @@ const Vf = {
       console.assert(!1);
       return;
     }
-    this.func.id = t.id, this.func.inputs = t.inputs, this.func.outputs = t.outputs;
+    this.func.id = t.id, this.func.inputs = t.inputs, this.func.outputs = t.outputs, this.updateShape_(), this.updateCheck_(), this.updateShadow_(), setTimeout(() => {
+      this.rebuildBlocks_(), this.checkWarning_();
+    }, 0);
   },
   updateShape_: function() {
     var e, t, n, o;
@@ -3825,8 +3827,8 @@ const Vf = {
       s && s.dispose(), this.removeInput("INPUT" + i);
     }
     for (let i = 0; i < this.func.inputs.length; i++) {
-      const { name: s } = this.func.inputs[i];
-      this.getInput("INPUT" + i) || (this.appendValueInput("INPUT" + i).setAlign(te.Align.RIGHT).appendField(s), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + i, "OUTPUT0") : this.moveInputBefore("INPUT" + i, "CALLBACK"));
+      const { name: s } = this.func.inputs[i], a = this.getInput("INPUT" + i);
+      a ? (this.setFieldValue(s, "NAME" + i), a.setCheck(null)) : (this.appendValueInput("INPUT" + i).setAlign(te.Align.RIGHT).appendField(s, "NAME" + i).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + i, "OUTPUT0") : this.moveInputBefore("INPUT" + i, "CALLBACK"));
     }
   },
   updateCheck_: function() {
@@ -3901,13 +3903,19 @@ r.forBlock.call_func_v1 = function(e) {
   const c = n(o.space.name + "/" + o.func.name);
   let l = "";
   o.func.outputs.forEach(({ id: h }) => {
-    l += `${t}var __output_${h}__ = result[${n(h)}];
+    l += `${t}var __output_${h}__ = __result__[${n(h)}];
 `;
   });
   const _ = r.statementToCode(o, "CALLBACK");
   return `{
 ${a}
-  var result = __callFuncV1__(${i}, ${s}, __inputs__, __getEnvV1__(), ${c});
+${t}var __result__ = __callFuncV1__(
+${t}${t}${i},
+${t}${t}${s},
+${t}${t}__inputs__,
+${t}${t}__getEnvV1__(),
+${t}${t}${c}
+${t});
 ${l}${_}}
 `;
 };
@@ -3989,7 +3997,9 @@ const Ff = {
       console.assert(!1);
       return;
     }
-    this.func.id = t.id, this.func.inputs = t.inputs, this.func.outputs = t.outputs;
+    this.func.id = t.id, this.func.inputs = t.inputs, this.func.outputs = t.outputs, this.updateShape_(), this.updateCheck_(), this.updateShadow_(), setTimeout(() => {
+      this.rebuildBlocks_(), this.checkWarning_();
+    }, 0);
   },
   updateShape_: function() {
     var e, t, n, o;
@@ -4009,8 +4019,8 @@ const Ff = {
       s && s.dispose(), this.removeInput("INPUT" + i);
     }
     for (let i = 0; i < this.func.inputs.length; i++) {
-      const { name: s } = this.func.inputs[i];
-      this.getInput("INPUT" + i) || (this.appendValueInput("INPUT" + i).setAlign(te.Align.RIGHT).appendField(s), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + i, "OUTPUT0") : this.moveInputBefore("INPUT" + i, "CALLBACK"));
+      const { name: s } = this.func.inputs[i], a = this.getInput("INPUT" + i);
+      a ? (this.setFieldValue(s, "NAME" + i), a.setCheck(null)) : (this.appendValueInput("INPUT" + i).setAlign(te.Align.RIGHT).appendField(s, "NAME" + i).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + i, "OUTPUT0") : this.moveInputBefore("INPUT" + i, "CALLBACK"));
     }
   },
   updateCheck_: function() {
@@ -4091,10 +4101,10 @@ r.forBlock.call_func_internal_v1 = function(e) {
   const _ = r.statementToCode(o, "CALLBACK");
   return `{
 ${a}
-  var __result__ = __callFuncInternalV1__(${i}, ${s}, __inputs__);
-  if (!__result__.success) {
-    throw 'call func<${c}> failed, reason: ' + __result__.message;
-  }
+${t}var __result__ = __callFuncInternalV1__(${i}, ${s}, __inputs__);
+${t}if (!__result__.success) {
+${t}${t}throw 'call func<${c}> failed, reason: ' + __result__.message;
+${t}}
 ${l}${_}}
 `;
 };
@@ -4317,22 +4327,21 @@ const $f = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Ge(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
-      ["DATA", "__data__", "PARAM_DATA", !0]
+      ["SUCCESS", "__result__.success", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__result__.message", "PARAM_MESSAGE", !0],
+      ["DATA", "__result__.data", "PARAM_DATA", !0]
     ]);
   }
 };
 k.add_data_v1 = $f;
 r.forBlock.add_data_v1 = function(e) {
-  const t = r.INDENT, n = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", o = r.statementToCode(e, "HANDLE");
+  const t = r.INDENT, n = "typeof(__tx__) !== 'undefined' ? __tx__ : null", o = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", i = r.statementToCode(e, "HANDLE");
   return `{
-${t}var tx = typeof(__tx__) !== 'undefined' ? __tx__ : null;
-${t}var res = __addDataV1__(tx, ${n});
-${t}var __success__ = res.success;
-${t}var __message__ = res.message;
-${t}var __data__ = res.data;
-${o}}
+${t}var __result__ = __addDataV1__(
+${t}${t}${n},
+${t}${t}${o}
+${t});
+${i}}
 `;
 };
 function kn() {
@@ -4631,20 +4640,21 @@ const zf = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Ge(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0]
+      ["SUCCESS", "__result__.success", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__result__.message", "PARAM_MESSAGE", !0]
     ]);
   }
 };
 k.delete_data_v1 = zf;
 r.forBlock.delete_data_v1 = function(e) {
-  const t = r.INDENT, n = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", o = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null", i = r.statementToCode(e, "HANDLE");
+  const t = r.INDENT, n = "typeof(__tx__) !== 'undefined' ? __tx__ : null", o = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", i = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null", s = r.statementToCode(e, "HANDLE");
   return `{
-${t}var tx = typeof(__tx__) !== 'undefined' ? __tx__ : null;
-${t}var res = __deleteDataV1__(tx, ${n}, ${o});
-${t}var __success__ = res.success;
-${t}var __message__ = res.message;
-${i}}
+${t}var __result__ = __deleteDataV1__(
+${t}${t}${n},
+${t}${t}${o},
+${t}${t}${i}
+${t});
+${s}}
 `;
 };
 C([
@@ -4690,27 +4700,27 @@ const Jf = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Ge(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
-      ["MAIN_DATA", "__mainData__", "PARAM_MAIN_DATA", !0],
-      ["EXTRA_DATA", "__extraData__", "PARAM_EXTRA_DATA", !0]
+      ["SUCCESS", "__result__.success", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__result__.message", "PARAM_MESSAGE", !0],
+      ["MAIN_DATA", "__result__.mainData", "PARAM_MAIN_DATA", !0],
+      ["EXTRA_DATA", "__result__.extraData", "PARAM_EXTRA_DATA", !0]
     ]);
   }
 };
 k.query_data_v1 = Jf;
 r.forBlock.query_data_v1 = function(e) {
-  const t = r.INDENT, n = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", o = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null";
-  let i = "null";
-  e.getInput("EXTRA") && (i = r.valueToCode(e, "EXTRA", u.ATOMIC) || "null");
-  const s = r.statementToCode(e, "HANDLE");
+  const t = r.INDENT, n = "typeof(__tx__) !== 'undefined' ? __tx__ : null", o = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", i = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null";
+  let s = "null";
+  e.getInput("EXTRA") && (s = r.valueToCode(e, "EXTRA", u.ATOMIC) || "null");
+  const a = r.statementToCode(e, "HANDLE");
   return `{
-${t}var tx = typeof(__tx__) !== 'undefined' ? __tx__ : null;
-${t}var res = __queryDataV1__(tx, ${n}, ${o}, ${i});
-${t}var __success__ = res.success;
-${t}var __message__ = res.message;
-${t}var __mainData__ = res.mainData;
-${t}var __extraData__ = res.extraData;
-${s}}
+${t}var __result__ = __queryDataV1__(
+${t}${t}${n},
+${t}${t}${o},
+${t}${t}${i},
+${t}${t}${s}
+${t});
+${a}}
 `;
 };
 C([
@@ -5312,22 +5322,22 @@ const im = {
   },
   rebuildBlocks_: function() {
     this.isInsertionMarker() || Ge(this, [
-      ["SUCCESS", "__success__", "PARAM_SUCCESS", !0],
-      ["MESSAGE", "__message__", "PARAM_MESSAGE", !0],
-      ["DATA", "__data__", "PARAM_DATA", !0]
+      ["SUCCESS", "__result__.success", "PARAM_SUCCESS", !0],
+      ["MESSAGE", "__result__.message", "PARAM_MESSAGE", !0],
+      ["DATA", "__result__.data", "PARAM_DATA", !0]
     ]);
   }
 };
 k.update_data_v1 = im;
 r.forBlock.update_data_v1 = function(e) {
-  const t = r.INDENT, n = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", o = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null", i = r.statementToCode(e, "HANDLE");
+  const t = r.INDENT, n = "typeof(__tx__) !== 'undefined' ? __tx__ : null", o = r.valueToCode(e, "TABLE", u.ATOMIC) || "null", i = r.valueToCode(e, "CONDITION", u.ATOMIC) || "null", s = r.statementToCode(e, "HANDLE");
   return `{
-${t}var tx = typeof(__tx__) !== 'undefined' ? __tx__ : null;
-${t}var res = __updateDataV1__(tx, ${n}, ${o});
-${t}var __success__ = res.success;
-${t}var __message__ = res.message;
-${t}var __data__ = res.data;
-${i}}
+${t}var __result__ = __updateDataV1__(
+${t}${t}${n},
+${t}${t}${o},
+${t}${t}${i}
+${t});
+${s}}
 `;
 };
 const sm = G.xml, am = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-block-lib",
   "private": false,
-  "version": "0.6.44",
+  "version": "0.6.46",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",