x-block-lib 0.8.35 → 0.8.37

package/dist/index.js

@@ -7,12 +7,12 @@
   License: see project LICENSE
   Touched: 2021
 */pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{background:#f3f3f3;color:#444}.hljs-comment{color:#697070}.hljs-punctuation,.hljs-tag{color:#444a}.hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656}.hljs-literal{color:#695}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta .hljs-string{color:#38a}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.ghost[data-v-daa85471]{opacity:.4;pointer-events:none}.blocklyToolbox{overflow-x:hidden;width:56px}.blocklyMainBackground{stroke-width:0}.blocklyToolboxCategory{margin-bottom:12px!important}.blocklyToolboxCategoryIcon{display:none!important}.blocklyTreeRowContentContainer{height:28px;display:flex;align-items:center;justify-items:center;overflow:hidden}.blocklyFlyout{z-index:21}`)),document.head.appendChild(l)}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import { E as I, r as Tn, M as vo, s as yo, a as Co, X as Rn, u as C, B as E, j as s, O as r, F as O, b as Ge, i as y, c as Tt, d as ko, e as U, f as T, g as No, h as $, k as ht, p as Yt, l as ot, m as En, n as B, C as Dn, N as it, o as Lo, P as We, q as Ve, V as Nt, t as Mn, W as So, v as Bo, w as bo, S as Po, x as Ro, y as Do, z as Wt, T as Ae, A as Un, D as Mo, G as Uo, H as Vn, I as Vo, J as xo, K as Yo, L as Fo, Q as wo, R as Ko, U as $o, Y as Ho } from "./vendor.txua272r.js";
+import { E as I, r as Tn, M as yo, s as vo, a as Co, X as Rn, u as C, B as E, j as s, O as u, F as O, b as Ge, i as v, c as Et, d as ko, e as U, f as T, g as No, h as $, k as ft, p as Ft, l as ot, m as En, n as B, C as Dn, N as it, o as Lo, P as We, q as Ve, V as St, t as Mn, W as So, v as Bo, w as bo, S as Po, x as Ro, y as Do, z as jt, T as Ae, A as Un, D as Mo, G as Uo, H as Vn, I as Vo, J as xo, K as Yo, L as Fo, Q as wo, R as Ko, U as $o, Y as Ho } from "./vendor.txua272r.js";
 import { globalState as g } from "x-state-lib";
-import { globalObjects as yt, openConfirmDlg as Go, openPromptDlg as Wo, messageWarning as xn, useColor as jt, useSystem as Yn, useViewStack as nn, eventBus as kt } from "x-essential-lib";
-import { pkgs as ie, parsePixelStr as jo, parsePercentStr as Xo, getPropertyTag as Mt, unwrapEventId as on, elements as et, makeEventId as Z, toEventName as Ie, unwrapMethodId as Oe, makeMethodId as ee, toMethodName as ve, unwrapPropertyId as Jo, makePropertyId as Zt, toPropertyName as Fn, isLocaleOfMethodKind as wn, makeTriggerId as Ot } from "x-runtime-lib";
-import { provide as qo, inject as Qo, defineComponent as ct, resolveComponent as M, createBlock as st, openBlock as S, unref as D, withCtx as at, createVNode as L, mergeProps as sn, useModel as Kt, ref as Lt, computed as F, resolveDirective as zo, withDirectives as Zo, createElementBlock as tt, normalizeStyle as j, createElementVNode as w, createCommentVNode as rt, toDisplayString as $t, withModifiers as Ft, mergeModels as je, Fragment as Kn, renderList as ti, useId as Xe, onUnmounted as ei, useTemplateRef as wt, withKeys as $n, isRef as ne, onMounted as gn, nextTick as ni, onBeforeUnmount as An, watch as Vt, renderSlot as oi } from "vue";
-import { useI18n as Xt } from "vue-i18n";
+import { globalObjects as kt, openConfirmDlg as Go, openPromptDlg as Wo, messageWarning as xn, useColor as Xt, useSystem as Yn, useViewStack as nn, eventBus as Lt } from "x-essential-lib";
+import { pkgs as ie, parsePixelStr as jo, parsePercentStr as Xo, getPropertyTag as Mt, unwrapEventId as on, elements as et, makeEventId as Z, toEventName as Ie, unwrapMethodId as Oe, makeMethodId as Yt, toMethodName as ye, unwrapPropertyId as Jo, makePropertyId as te, toPropertyName as Fn, isLocaleOfMethodKind as wn, makeTriggerId as yt } from "x-runtime-lib";
+import { provide as qo, inject as Qo, defineComponent as rt, resolveComponent as M, createBlock as st, openBlock as S, unref as D, withCtx as at, createVNode as L, mergeProps as sn, useModel as $t, ref as Bt, computed as w, resolveDirective as zo, withDirectives as Zo, createElementBlock as tt, normalizeStyle as j, createElementVNode as K, createCommentVNode as ut, toDisplayString as Ht, withModifiers as wt, mergeModels as je, Fragment as Kn, renderList as ti, useId as Xe, onUnmounted as ei, useTemplateRef as Kt, withKeys as $n, isRef as ne, onMounted as gn, nextTick as ni, onBeforeUnmount as An, watch as Vt, renderSlot as oi } from "vue";
+import { useI18n as Jt } from "vue-i18n";
 import { useDisplay as ii } from "vuetify";
 var b = /* @__PURE__ */ ((t) => (t.STATE_CHANGE = "state_change", t))(b || {});
 class Hn extends I.Abstract {
@@ -30,14 +30,14 @@ const Gn = (t, e, n) => {
   });
 };
 async function In(t) {
-  const e = await Gn(/* @__PURE__ */ Object.assign({ "./msg/en.ts": () => import("./msg-en.gmqsbfuw.js"), "./msg/zhHans.ts": () => import("./msg-zhHans.f0e8559c.js") }), `./msg/${t}.ts`, 3);
-  yo(e.default);
+  const e = await Gn(/* @__PURE__ */ Object.assign({ "./msg/en.ts": () => import("./msg-en.jch03670.js"), "./msg/zhHans.ts": () => import("./msg-zhHans.e9yn43wz.js") }), `./msg/${t}.ts`, 3);
+  vo(e.default);
 }
 function f(t) {
-  return vo[t] ?? t;
+  return yo[t] ?? t;
 }
-const St = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cGF0aCBkPSJNMTggMTBoLTR2LTRjMC0xLjEwNC0uODk2LTItMi0ycy0yIC44OTYtMiAybC4wNzEgNGgtNC4wNzFjLTEuMTA0IDAtMiAuODk2LTIgMnMuODk2IDIgMiAybDQuMDcxLS4wNzEtLjA3MSA0LjA3MWMwIDEuMTA0Ljg5NiAyIDIgMnMyLS44OTYgMi0ydi00LjA3MWw0IC4wNzFjMS4xMDQgMCAyLS44OTYgMi0ycy0uODk2LTItMi0yeiIgZmlsbD0id2hpdGUiIC8+PC9zdmc+Cg==", se = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cGF0aCBkPSJNMTggMTFoLTEyYy0xLjEwNCAwLTIgLjg5Ni0yIDJzLjg5NiAyIDIgMmgxMmMxLjEwNCAwIDItLjg5NiAyLTJzLS44OTYtMi0yLTJ6IiBmaWxsPSJ3aGl0ZSIgLz48L3N2Zz4K";
-function ye(t) {
+const bt = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cGF0aCBkPSJNMTggMTBoLTR2LTRjMC0xLjEwNC0uODk2LTItMi0ycy0yIC44OTYtMiAybC4wNzEgNGgtNC4wNzFjLTEuMTA0IDAtMiAuODk2LTIgMnMuODk2IDIgMiAybDQuMDcxLS4wNzEtLjA3MSA0LjA3MWMwIDEuMTA0Ljg5NiAyIDIgMnMyLS44OTYgMi0ydi00LjA3MWw0IC4wNzFjMS4xMDQgMCAyLS44OTYgMi0ycy0uODk2LTItMi0yeiIgZmlsbD0id2hpdGUiIC8+PC9zdmc+Cg==", se = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cGF0aCBkPSJNMTggMTFoLTEyYy0xLjEwNCAwLTIgLjg5Ni0yIDJzLjg5NiAyIDIgMmgxMmMxLjEwNCAwIDItLjg5NiAyLTJzLS44OTYtMi0yLTJ6IiBmaWxsPSJ3aGl0ZSIgLz48L3N2Zz4K";
+function ve(t) {
   const e = t.lastIndexOf("V");
   if (e <= 0 || e >= t.length - 1)
     return console.assert(!1, `invalid key=${t}`), "";
@@ -66,13 +66,13 @@ function Wn(t) {
 function Ce(t, e) {
   return !!(t.startsWith("basic.") || !e.ui || e.readonly);
 }
-function K(t) {
+function V(t) {
   return t.startsWith("globality_v");
 }
-function Q(t) {
+function J(t) {
   return t.startsWith("reference_v");
 }
-function z(t) {
+function q(t) {
   return t.startsWith("multiple_ref_v");
 }
 function xe(t) {
@@ -90,7 +90,7 @@ function Je(t, e) {
   let n = null;
   return e === "string" ? n = xe("") : e === "integer" || e === "decimal" ? n = On(0) : e === "boolean" ? n = ai() : e === "enum" || e === "dateTime" ? n = xe("") : console.assert(!1), n ? Rn.domToBlock(n, t) : null;
 }
-function Et(t) {
+function gt(t) {
   return t === "string" ? "String" : t === "number" ? "Number" : t === "boolean" ? "Boolean" : t === "array" ? "Array" : t === "object" ? "Object" : (console.assert(!1), null);
 }
 function ci(t) {
@@ -107,13 +107,13 @@ function an(t, e, n, o) {
 `, a = C.xml.textToDom(i);
   return Rn.domToBlock(a, t);
 }
-function Y(t, e) {
+function F(t, e) {
   try {
     I.disable(), e.forEach((n) => {
-      const [o, i, a, c] = n, u = t.getInput(o)?.connection;
-      if (!u)
+      const [o, i, a, c] = n, r = t.getInput(o)?.connection;
+      if (!r)
         return;
-      let l = u.targetBlock();
+      let l = r.targetBlock();
       if (l) {
         const _ = l;
         if (_ && _.key === i && _.name === a && _.locale === c)
@@ -125,13 +125,13 @@ function Y(t, e) {
         i,
         a,
         c
-      ), l.outputConnection.connect(u);
+      ), l.outputConnection.connect(r);
     });
   } finally {
     I.enable();
   }
 }
-function pt(t) {
+function dt(t) {
   const e = `<shadow type="text_v1"><field name="TEXT">${t}</field></shadow>`;
   return C.xml.textToDom(e);
 }
@@ -150,11 +150,11 @@ function ui() {
   return C.xml.textToDom('<shadow type="object_create_v1"></shadow>');
 }
 function li(t) {
-  const e = `<shadow type="${ye(t)}"></shadow>`;
+  const e = `<shadow type="${ve(t)}"></shadow>`;
   return C.xml.textToDom(e);
 }
 function _i(t) {
-  const e = `<shadow type="${ye(t)}"></shadow>`;
+  const e = `<shadow type="${ve(t)}"></shadow>`;
   return C.xml.textToDom(e);
 }
 function pi(t) {
@@ -164,13 +164,13 @@ function pi(t) {
 function di() {
   return C.xml.textToDom('<shadow type="select_comp_v1"></shadow>');
 }
-function gt(t) {
+function At(t) {
   let e = null;
-  return t === "string" ? e = pt("") : t === "number" ? e = ce(0) : t === "boolean" ? e = re(!1) : t === "array" ? e = ri() : t === "object" ? e = ui() : console.assert(!1), e;
+  return t === "string" ? e = dt("") : t === "number" ? e = ce(0) : t === "boolean" ? e = re(!1) : t === "array" ? e = ri() : t === "object" ? e = ui() : console.assert(!1), e;
 }
 function hi(t) {
   let e = null;
-  return t.ui === "dummy" ? console.assert(!0) : t.ui === "strInput" ? e = pt(t.default) : t.ui === "numInput" ? e = ce(t.default) : t.ui === "switch" ? e = re(t.default) : t.ui === "select" ? e = li(t.items) : t.ui === "multiTypes" ? e = _i(t.types) : t.ui === "compSelect" ? e = di() : t.ui === "colorPicker" ? e = pi(t.default ?? "#ff0000") : console.assert(!1), e;
+  return t.ui === "dummy" ? console.assert(!0) : t.ui === "strInput" ? e = dt(t.default) : t.ui === "numInput" ? e = ce(t.default) : t.ui === "switch" ? e = re(t.default) : t.ui === "select" ? e = li(t.items) : t.ui === "multiTypes" ? e = _i(t.types) : t.ui === "compSelect" ? e = di() : t.ui === "colorPicker" ? e = pi(t.default ?? "#ff0000") : console.assert(!1), e;
 }
 function fi() {
   const { activeObject: t, activePage: e } = g.app, n = [];
@@ -179,7 +179,7 @@ function fi() {
       n.push({ key: o, name: i, type: a });
   return n;
 }
-function vn(t) {
+function yn(t) {
   const { activeObject: e, activePage: n } = g.app;
   if (e.type === "page") {
     const o = n.meta.arguments.find((i) => i.id === t);
@@ -232,7 +232,7 @@ const Ti = {
     }
   },
   onArgumentChange_: function(t) {
-    const e = vn(t);
+    const e = yn(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -240,10 +240,10 @@ const Ti = {
     this.argument.key = e.key, this.argument.name = e.name, this.argument.type = e.type, this.updateShape_();
   },
   updateShape_: function() {
-    this.setOutput(!0, Et(this.argument.type));
+    this.setOutput(!0, gt(this.argument.type));
   },
   checkWarning_: function() {
-    const t = vn(this.argument.key);
+    const t = yn(this.argument.key);
     if (!t) {
       this.setWarningText(f("WARN_ARGUMENT_NOT_FOUND"));
       return;
@@ -258,10 +258,10 @@ const Ti = {
 E.get_page_argument_v1 = Ti;
 s.forBlock.get_page_argument_v1 = function(t) {
   const e = t;
-  return [`__getPageArgumentV1__(${s.quote_(e.argument.key)})`, r.FUNCTION_CALL];
+  return [`__getPageArgumentV1__(${s.quote_(e.argument.key)})`, u.FUNCTION_CALL];
 };
 const Ei = (t, e) => {
-  const n = ye(t), o = ae(t);
+  const n = ve(t), o = ae(t);
   E[n] = {
     init: function() {
       this.appendDummyInput().appendField(
@@ -270,14 +270,14 @@ const Ei = (t, e) => {
       ), this.setOutput(!0, o), this.setStyle("property_blocks"), this.setTooltip(""), this.setHelpUrl("");
     },
     genOpts_: function() {
-      const { i18n: i } = yt, a = [];
-      for (const { title: c, value: u } of e)
-        a.push([i.global.t(c), u]);
+      const { i18n: i } = kt, a = [];
+      for (const { title: c, value: r } of e)
+        a.push([i.global.t(c), r]);
       return k(a);
     }
   }, s.forBlock[n] = function(i) {
     const a = s.quote_, c = i.getFieldValue("ITEM");
-    return [a(c), r.ATOMIC];
+    return [a(c), u.ATOMIC];
   };
 };
 for (const t in ie) {
@@ -286,7 +286,7 @@ for (const t in ie) {
     Ei(n, e.items[n]);
 }
 const gi = (t, e) => {
-  const n = ye(t), o = ae(t);
+  const n = ve(t), o = ae(t);
   E[n] = {
     init: function() {
       this.value = e[0].default ?? "", this.appendDummyInput("DUMMY").appendField(
@@ -303,9 +303,9 @@ const gi = (t, e) => {
       }, 0);
     },
     genOpts_: function() {
-      const { i18n: i } = yt, a = [];
-      for (const { title: c, value: u } of e)
-        a.push([i.global.t(c), u]);
+      const { i18n: i } = kt, a = [];
+      for (const { title: c, value: r } of e)
+        a.push([i.global.t(c), r]);
       return k(a);
     },
     onchange: function(i) {
@@ -336,10 +336,10 @@ const gi = (t, e) => {
       if (!c)
         return;
       i.removeField("VALUE", !0), i.removeField("SUFFIX", !0);
-      let u, l;
+      let r, l;
       if (c.ui === "pixelInput") {
         const _ = jo(this.value) ?? 0;
-        u = new Ge(
+        r = new Ge(
           _,
           c.min,
           c.max,
@@ -350,7 +350,7 @@ const gi = (t, e) => {
         ), l = "px";
       } else if (c.ui === "percentInput") {
         const _ = Xo(this.value) ?? 0;
-        u = new Ge(
+        r = new Ge(
           _,
           c.min,
           c.max,
@@ -360,7 +360,7 @@ const gi = (t, e) => {
           }
         ), l = "%";
       }
-      u && i.appendField(u, "VALUE"), l && i.appendField(l, "SUFFIX");
+      r && i.appendField(r, "VALUE"), l && i.appendField(l, "SUFFIX");
     },
     checkWarning_: function() {
       let i = this.value;
@@ -372,7 +372,7 @@ const gi = (t, e) => {
     }
   }, s.forBlock[n] = function(i) {
     const a = s.quote_;
-    return [a(i.value), r.ATOMIC];
+    return [a(i.value), u.ATOMIC];
   };
 };
 for (const t in ie) {
@@ -394,10 +394,10 @@ const Oi = {
   }
 };
 E.app_bind_item_v1 = Oi;
-const vi = {
+const yi = {
   init: function() {
     this.itemCount_ = 0, this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["app_bind_item_v1"],
         this
       )
@@ -482,7 +482,7 @@ const vi = {
         "Boolean",
         "Array",
         "Object"
-      ]), t === 0 && this.getInput("ADD" + t).setAlign(y.Align.RIGHT).appendField("%{BKY_APP_V1_APP_BIND_TITLE}"));
+      ]), t === 0 && this.getInput("ADD" + t).setAlign(v.Align.RIGHT).appendField("%{BKY_APP_V1_APP_BIND_TITLE}"));
     for (let t = this.itemCount_; this.getInput("ADD" + t); t++)
       this.removeInput("ADD" + t);
   },
@@ -512,17 +512,17 @@ const vi = {
     this.setWarningText(null);
   }
 };
-E.app_bind_v1 = vi;
+E.app_bind_v1 = yi;
 s.forBlock.app_bind_v1 = function() {
   return "";
 };
 function Xn() {
   return g.app.appList;
 }
-function yn(t) {
+function vn(t) {
   return g.app.appList.find((e) => e.id === t);
 }
-function yi() {
+function vi() {
   const t = [];
   return Xn().forEach(({ id: n, name: o }) => {
     t.push([o, n]);
@@ -557,27 +557,27 @@ function Cn(t) {
   return t === "" ? Jn : g.app.activeApp.comps.find((e) => e.id === t);
 }
 function ki() {
-  const { i18n: t } = yt, e = [];
+  const { i18n: t } = kt, e = [];
   return qn().forEach(({ id: o, name: i }) => {
     let a = i;
     o === "" && (a = t.global.t("x-runtime-lib.notSet")), e.push([a, o]);
   }), k(e);
 }
-function dt(t) {
+function ht(t) {
   const e = [];
   for (const { id: n, name: o, type: i } of t)
     e.push({ key: n, name: o, type: i });
   return e;
 }
-function J(t) {
+function Q(t) {
   return [
     { key: "newValue", name: "x-runtime-lib.newValue", type: t },
     { key: "oldValue", name: "x-runtime-lib.oldValue", type: t }
   ];
 }
 function Qe(t) {
-  const { properties: e } = g.runtime, { activeObject: n, activePage: o, activeComp: i, depends: a } = g.app, c = [], u = Mt(n.type, n.subtype);
-  if (!u)
+  const { properties: e } = g.runtime, { activeObject: n, activePage: o, activeComp: i, depends: a } = g.app, c = [], r = Mt(n.type, n.subtype);
+  if (!r)
     return c;
   const l = n.nodes.find((d) => d.id === t);
   if (!l)
@@ -592,7 +592,7 @@ function Qe(t) {
       names: [h],
       params: p
     });
-  if (Q(_.key) && l.reference && l.reference.comp) {
+  if (J(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, params: m } of d.meta.events)
@@ -600,10 +600,10 @@ function Qe(t) {
           id: Z("referenceEvent", t, h),
           kind: "referenceEvent",
           names: [p],
-          params: dt(m)
+          params: ht(m)
         });
   }
-  if (z(_.key) && l.reference && l.reference.comp) {
+  if (q(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, params: m } of d.meta.events)
@@ -611,26 +611,26 @@ function Qe(t) {
           id: Z("multipleRefEvent", t, h),
           kind: "multipleRefEvent",
           names: [p],
-          params: dt(m)
+          params: ht(m)
         });
   }
-  if (K(_.key) && n.type === "comp")
+  if (V(_.key) && n.type === "comp")
     for (const { id: d, name: h, params: p } of i.meta.events)
       c.push({
         id: Z("customEvent", t, d),
         kind: "customEvent",
         names: [h],
-        params: dt(p)
+        params: ht(p)
       });
-  if (e[_.key] && e[_.key][u])
-    for (const { keys: d, names: h, raw: p } of e[_.key][u])
+  if (e[_.key] && e[_.key][r])
+    for (const { keys: d, names: h, raw: p } of e[_.key][r])
       Ce(d, p) || c.push({
         id: Z("elementPropertyChangeEvent", t, d),
         kind: "elementPropertyChangeEvent",
         names: h,
-        params: J(Wn(p))
+        params: Q(Wn(p))
       });
-  if (Q(_.key) && l.reference && l.reference.comp) {
+  if (J(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, type: m } of d.meta.properties)
@@ -638,10 +638,10 @@ function Qe(t) {
           id: Z("referencePropertyChangeEvent", t, h),
           kind: "referencePropertyChangeEvent",
           names: [p],
-          params: J(m)
+          params: Q(m)
         });
   }
-  if (z(_.key) && l.reference && l.reference.comp) {
+  if (q(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, type: m } of d.meta.properties)
@@ -649,25 +649,25 @@ function Qe(t) {
           id: Z("multipleRefPropertyChangeEvent", t, h),
           kind: "multipleRefPropertyChangeEvent",
           names: [p],
-          params: J(m)
+          params: Q(m)
         });
   }
-  if (K(_.key) && n.type === "comp")
+  if (V(_.key) && n.type === "comp")
     for (const { id: d, name: h, type: p } of i.meta.properties)
       c.push({
         id: Z("customPropertyChangeEvent", t, d),
         kind: "customPropertyChangeEvent",
         names: [h],
-        params: J(p)
+        params: Q(p)
       });
-  if (K(_.key)) {
+  if (V(_.key)) {
     if (n.type === "page")
       for (const { id: d, name: h, type: p } of o.meta.states)
         c.push({
           id: Z("stateChangeEvent", "globality", d),
           kind: "stateChangeEvent",
           names: [h],
-          params: J(p)
+          params: Q(p)
         });
     else if (n.type === "comp")
       for (const { id: d, name: h, type: p } of i.meta.states)
@@ -675,7 +675,7 @@ function Qe(t) {
           id: Z("stateChangeEvent", "globality", d),
           kind: "stateChangeEvent",
           names: [h],
-          params: J(p)
+          params: Q(p)
         });
   }
   return c;
@@ -686,7 +686,7 @@ function Fe(t) {
   const { properties: e } = g.runtime, { activeObject: n, activePage: o, activeComp: i, depends: a } = g.app, c = Mt(n.type, n.subtype);
   if (!c)
     return;
-  const { kind: u, nodeId: l, eventKey: _ } = on(t), d = n.nodes.find((p) => p.id === l);
+  const { kind: r, nodeId: l, eventKey: _ } = on(t), d = n.nodes.find((p) => p.id === l);
   if (!d)
     return;
   const h = et[d.key];
@@ -694,55 +694,55 @@ function Fe(t) {
     console.assert(!1, "invalid element", d.key);
     return;
   }
-  if (u === "elementEvent") {
+  if (r === "elementEvent") {
     const p = h.events.find((m) => m.key === _);
     if (p)
       return {
         id: t,
-        kind: u,
+        kind: r,
         names: [p.name],
         params: p.params
       };
-  } else if (u === "referenceEvent") {
-    if (Q(h.key) && d.reference && d.reference.comp) {
+  } else if (r === "referenceEvent") {
+    if (J(h.key) && d.reference && d.reference.comp) {
       const p = a[d.reference.comp];
       if (p) {
         const m = p.meta.events.find((A) => A.id === _);
         if (m)
           return {
             id: t,
-            kind: u,
+            kind: r,
             names: [m.name],
-            params: dt(m.params)
+            params: ht(m.params)
           };
       }
     }
-  } else if (u === "multipleRefEvent") {
-    if (z(h.key) && d.reference && d.reference.comp) {
+  } else if (r === "multipleRefEvent") {
+    if (q(h.key) && d.reference && d.reference.comp) {
       const p = a[d.reference.comp];
       if (p) {
         const m = p.meta.events.find((A) => A.id === _);
         if (m)
           return {
             id: t,
-            kind: u,
+            kind: r,
             names: [m.name],
-            params: dt(m.params)
+            params: ht(m.params)
           };
       }
     }
-  } else if (u === "customEvent") {
-    if (K(h.key) && n.type === "comp") {
+  } else if (r === "customEvent") {
+    if (V(h.key) && n.type === "comp") {
       const p = i.meta.events.find((m) => m.id === _);
       if (p)
         return {
           id: t,
-          kind: u,
+          kind: r,
           names: [p.name],
-          params: dt(p.params)
+          params: ht(p.params)
         };
     }
-  } else if (u === "elementPropertyChangeEvent") {
+  } else if (r === "elementPropertyChangeEvent") {
     if (e[h.key] && e[h.key][c]) {
       const p = e[h.key][c].find(
         (m) => m.keys === _
@@ -750,13 +750,13 @@ function Fe(t) {
       if (p)
         return {
           id: t,
-          kind: u,
+          kind: r,
           names: p.names,
-          params: J(Wn(p.raw))
+          params: Q(Wn(p.raw))
         };
     }
-  } else if (u === "referencePropertyChangeEvent") {
-    if (Q(h.key) && d.reference && d.reference.comp) {
+  } else if (r === "referencePropertyChangeEvent") {
+    if (J(h.key) && d.reference && d.reference.comp) {
       const p = a[d.reference.comp];
       if (p) {
         const m = p.meta.properties.find(
@@ -765,14 +765,14 @@ function Fe(t) {
         if (m)
           return {
             id: t,
-            kind: u,
+            kind: r,
             names: [m.name],
-            params: J(m.type)
+            params: Q(m.type)
           };
       }
     }
-  } else if (u === "multipleRefPropertyChangeEvent") {
-    if (z(h.key) && d.reference && d.reference.comp) {
+  } else if (r === "multipleRefPropertyChangeEvent") {
+    if (q(h.key) && d.reference && d.reference.comp) {
       const p = a[d.reference.comp];
       if (p) {
         const m = p.meta.properties.find(
@@ -781,26 +781,26 @@ function Fe(t) {
         if (m)
           return {
             id: t,
-            kind: u,
+            kind: r,
             names: [m.name],
-            params: J(m.type)
+            params: Q(m.type)
           };
       }
     }
-  } else if (u === "customPropertyChangeEvent") {
-    if (K(h.key) && n.type === "comp") {
+  } else if (r === "customPropertyChangeEvent") {
+    if (V(h.key) && n.type === "comp") {
       const p = i.meta.properties.find(
         (m) => m.id === _
       );
       if (p)
         return {
           id: t,
-          kind: u,
+          kind: r,
           names: [p.name],
-          params: J(p.type)
+          params: Q(p.type)
         };
     }
-  } else if (u === "stateChangeEvent" && K(h.key)) {
+  } else if (r === "stateChangeEvent" && V(h.key)) {
     if (n.type === "page") {
       const p = o.meta.states.find(
         (m) => m.id === _
@@ -808,9 +808,9 @@ function Fe(t) {
       if (p)
         return {
           id: t,
-          kind: u,
+          kind: r,
           names: [p.name],
-          params: J(p.type)
+          params: Q(p.type)
         };
     } else if (n.type === "comp") {
       const p = i.meta.states.find(
@@ -819,9 +819,9 @@ function Fe(t) {
       if (p)
         return {
           id: t,
-          kind: u,
+          kind: r,
           names: [p.name],
-          params: J(p.type)
+          params: Q(p.type)
         };
     }
   }
@@ -840,7 +840,7 @@ function Qn() {
         id: Z("customEvent", "globality", o),
         kind: "customEvent",
         names: [i],
-        params: dt(a)
+        params: ht(a)
       });
   return n;
 }
@@ -850,14 +850,14 @@ function kn(t) {
   const { activeObject: e, activeComp: n } = g.app, { kind: o, nodeId: i, eventKey: a } = on(t);
   if (o === "customEvent" && i === "globality" && e.type === "comp") {
     const c = n.meta.events.find(
-      (u) => u.id === a
+      (r) => r.id === a
     );
     if (c)
       return {
         id: t,
         kind: o,
         names: [c.name],
-        params: dt(c.params)
+        params: ht(c.params)
       };
   }
 }
@@ -867,118 +867,141 @@ function Li() {
     t.push([Ie(o, i), n]);
   return k(t);
 }
-function Pt(t) {
+function ct(t) {
   const e = [];
   for (const { id: n, name: o, type: i } of t)
     e.push({ key: n, name: o, type: i });
   return e;
 }
-function Rt(t) {
+function Ct(t) {
   const e = [];
   for (const { id: n, name: o, type: i } of t)
     e.push({ key: n, name: o, type: i });
   return e;
 }
 function ze(t) {
-  const { activeObject: e, depends: n } = g.app, o = [], i = e.nodes.find((c) => c.id === t);
-  if (!i)
-    return o;
-  const a = et[i.key];
+  const { activeObject: e, activeComp: n, depends: o } = g.app, i = [], a = e.nodes.find((r) => r.id === t);
   if (!a)
-    return console.assert(!1, "inavlid element", i.key), o;
-  for (const { key: c, name: u, inputs: l, outputs: _ } of a.methods)
-    o.push({
-      id: ee("elementMethod", t, c),
+    return i;
+  const c = et[a.key];
+  if (!c)
+    return console.assert(!1, "inavlid element", a.key), i;
+  for (const { key: r, name: l, inputs: _, outputs: d } of c.methods)
+    i.push({
+      id: Yt("elementMethod", t, r),
       kind: "elementMethod",
-      names: [u],
-      inputs: l,
-      outputs: _
+      names: [l],
+      inputs: _,
+      outputs: d
     });
-  if (Q(a.key) && i.reference && i.reference.comp) {
-    const c = n[i.reference.comp];
-    if (c)
-      for (const { id: u, name: l, inputs: _, outputs: d } of c.meta.methods)
-        o.push({
-          id: ee("referenceMethod", t, u),
+  if (J(c.key) && a.reference && a.reference.comp) {
+    const r = o[a.reference.comp];
+    if (r)
+      for (const { id: l, name: _, inputs: d, outputs: h } of r.meta.methods)
+        i.push({
+          id: Yt("referenceMethod", t, l),
           kind: "referenceMethod",
-          names: [l],
-          inputs: Pt(_),
-          outputs: Rt(d)
+          names: [_],
+          inputs: ct(d),
+          outputs: Ct(h)
         });
   }
-  if (z(a.key) && i.reference && i.reference.comp) {
-    const c = n[i.reference.comp];
-    if (c)
-      for (const { id: u, name: l, inputs: _, outputs: d } of c.meta.methods)
-        o.push({
-          id: ee("multipleRefMethod", t, u),
+  if (q(c.key) && a.reference && a.reference.comp) {
+    const r = o[a.reference.comp];
+    if (r)
+      for (const { id: l, name: _, inputs: d, outputs: h } of r.meta.methods)
+        i.push({
+          id: Yt("multipleRefMethod", t, l),
           kind: "multipleRefMethod",
-          names: [l],
-          inputs: Pt(_),
-          outputs: Rt(d)
+          names: [_],
+          inputs: ct(d),
+          outputs: Ct(h)
         });
   }
-  return K(a.key) && e.type, o;
+  if (V(c.key) && e.type === "comp")
+    for (const { id: r, name: l, inputs: _, outputs: d } of n.meta.methods)
+      i.push({
+        id: Yt("customMethod", t, r),
+        kind: "customMethod",
+        names: [l],
+        inputs: ct(_),
+        outputs: Ct(d)
+      });
+  return V(c.key) && e.type, i;
 }
 function we(t) {
   if (!t)
     return;
-  const { activeObject: e, depends: n } = g.app, { kind: o, nodeId: i, methodKey: a } = Oe(t), c = e.nodes.find((l) => l.id === i);
-  if (!c)
+  const { activeObject: e, activeComp: n, depends: o } = g.app, { kind: i, nodeId: a, methodKey: c } = Oe(t), r = e.nodes.find((_) => _.id === a);
+  if (!r)
     return;
-  const u = et[c.key];
-  if (!u) {
-    console.assert(!1, "invalid element", c.key);
+  const l = et[r.key];
+  if (!l) {
+    console.assert(!1, "invalid element", r.key);
     return;
   }
-  if (o === "elementMethod") {
-    const l = u.methods.find((_) => _.key === a);
-    if (l)
+  if (i === "elementMethod") {
+    const _ = l.methods.find((d) => d.key === c);
+    if (_)
       return {
         id: t,
-        kind: o,
-        names: [l.name],
-        inputs: l.inputs,
-        outputs: l.outputs
+        kind: i,
+        names: [_.name],
+        inputs: _.inputs,
+        outputs: _.outputs
       };
-  } else if (o === "referenceMethod") {
-    if (Q(u.key) && c.reference && c.reference.comp) {
-      const l = n[c.reference.comp];
-      if (l) {
-        const _ = l.meta.methods.find(
-          (d) => d.id === a
+  } else if (i === "referenceMethod") {
+    if (J(l.key) && r.reference && r.reference.comp) {
+      const _ = o[r.reference.comp];
+      if (_) {
+        const d = _.meta.methods.find(
+          (h) => h.id === c
         );
-        if (_)
+        if (d)
           return {
             id: t,
-            kind: o,
-            names: [_.name],
-            inputs: Pt(_.inputs),
-            outputs: Rt(_.outputs)
+            kind: i,
+            names: [d.name],
+            inputs: ct(d.inputs),
+            outputs: Ct(d.outputs)
           };
       }
     }
-  } else if (o === "multipleRefMethod" && z(u.key) && c.reference && c.reference.comp) {
-    const l = n[c.reference.comp];
-    if (l) {
-      const _ = l.meta.methods.find(
-        (d) => d.id === a
-      );
-      if (_)
-        return {
-          id: t,
-          kind: o,
-          names: [_.name],
-          inputs: Pt(_.inputs),
-          outputs: Rt(_.outputs)
-        };
+  } else if (i === "multipleRefMethod") {
+    if (q(l.key) && r.reference && r.reference.comp) {
+      const _ = o[r.reference.comp];
+      if (_) {
+        const d = _.meta.methods.find(
+          (h) => h.id === c
+        );
+        if (d)
+          return {
+            id: t,
+            kind: i,
+            names: [d.name],
+            inputs: ct(d.inputs),
+            outputs: Ct(d.outputs)
+          };
+      }
     }
+  } else if (i === "customMethod" && V(l.key) && e.type === "comp") {
+    const _ = n.meta.methods.find(
+      (d) => d.id === c
+    );
+    if (_)
+      return {
+        id: t,
+        kind: i,
+        names: [_.name],
+        inputs: ct(_.inputs),
+        outputs: ct(_.outputs)
+      };
   }
 }
 function Si(t) {
   const e = [], n = ze(t);
   for (const { id: o, kind: i, names: a } of n)
-    e.push([ve(i, a), o]);
+    e.push([ye(i, a), o]);
   return k(e);
 }
 function cn() {
@@ -986,11 +1009,11 @@ function cn() {
   if (t.type === "comp")
     for (const { id: o, name: i, inputs: a, outputs: c } of e.meta.methods)
       n.push({
-        id: ee("customMethod", "globality", o),
+        id: Yt("customMethod", "globality", o),
         kind: "customMethod",
         names: [i],
-        inputs: Pt(a),
-        outputs: Rt(c)
+        inputs: ct(a),
+        outputs: Ct(c)
       });
   return n;
 }
@@ -1000,22 +1023,22 @@ function Dt(t) {
   const { activeObject: e, activeComp: n } = g.app, { kind: o, nodeId: i, methodKey: a } = Oe(t);
   if (o === "customMethod" && i === "globality" && e.type === "comp") {
     const c = n.meta.methods.find(
-      (u) => u.id === a
+      (r) => r.id === a
     );
     if (c)
       return {
         id: t,
         kind: o,
         names: [c.name],
-        inputs: Pt(c.inputs),
-        outputs: Rt(c.outputs)
+        inputs: ct(c.inputs),
+        outputs: Ct(c.outputs)
       };
   }
 }
 function zn() {
   const t = [], e = cn();
   for (const { id: n, kind: o, names: i } of e)
-    t.push([ve(o, i), n]);
+    t.push([ye(o, i), n]);
   return k(t);
 }
 function Ze(t) {
@@ -1034,27 +1057,39 @@ function Bi(t) {
   return k(e);
 }
 function bi(t, e, n) {
-  const { properties: o } = g.runtime, { activeObject: i, activePage: a, activeComp: c, depends: u } = g.app;
+  const { properties: o } = g.runtime, { activeObject: i, activePage: a, activeComp: c, depends: r } = g.app;
   if (t.events.length > 0)
     return !1;
-  if (Q(t.key) && n) {
-    const l = u[n];
+  if (J(t.key) && n) {
+    const l = r[n];
     if (l && l.meta.events.length > 0)
       return !1;
   }
-  if (z(t.key) && n) {
-    const l = u[n];
+  if (q(t.key) && n) {
+    const l = r[n];
     if (l && l.meta.events.length > 0)
       return !1;
   }
+  if (V(t.key) && i.type === "comp" && c.meta.events.length > 0)
+    return !1;
   if (o[t.key] && o[t.key][e]) {
     for (const { keys: l, raw: _ } of o[t.key][e])
       if (!Ce(l, _))
         return !1;
   }
-  if (K(t.key) && i.type === "comp" && c.meta.properties.length > 0)
+  if (J(t.key) && n) {
+    const l = r[n];
+    if (l && l.meta.properties.length > 0)
+      return !1;
+  }
+  if (q(t.key) && n) {
+    const l = r[n];
+    if (l && l.meta.properties.length > 0)
+      return !1;
+  }
+  if (V(t.key) && i.type === "comp" && c.meta.properties.length > 0)
     return !1;
-  if (K(t.key)) {
+  if (V(t.key)) {
     if (i.type === "page") {
       if (a.meta.states.length > 0)
         return !1;
@@ -1064,55 +1099,55 @@ function bi(t, e, n) {
   return !0;
 }
 function Pi(t, e) {
-  const { activeObject: n, depends: o } = g.app;
+  const { activeObject: n, activeComp: o, depends: i } = g.app;
   if (t.methods.length > 0)
     return !1;
-  if (Q(t.key) && e) {
-    const i = o[e];
-    if (i && i.meta.methods.length > 0)
+  if (J(t.key) && e) {
+    const a = i[e];
+    if (a && a.meta.methods.length > 0)
       return !1;
   }
-  if (z(t.key) && e) {
-    const i = o[e];
-    if (i && i.meta.methods.length > 0)
+  if (q(t.key) && e) {
+    const a = i[e];
+    if (a && a.meta.methods.length > 0)
       return !1;
   }
-  return K(t.key) && n.type, !0;
+  return V(t.key) && n.type === "comp" && o.meta.methods.length > 0 ? !1 : (V(t.key) && n.type, !0);
 }
 function Ri(t, e, n) {
   const { properties: o } = g.runtime, { activeObject: i, activeComp: a, depends: c } = g.app;
   if (o[t.key] && o[t.key][e] && o[t.key][e].length > 0)
     return !1;
-  if (Q(t.key) && n) {
-    const u = c[n];
-    if (u && u.meta.properties.length > 0)
+  if (J(t.key) && n) {
+    const r = c[n];
+    if (r && r.meta.properties.length > 0)
       return !1;
   }
-  if (z(t.key) && n) {
-    const u = c[n];
-    if (u && u.meta.properties.length > 0)
+  if (q(t.key) && n) {
+    const r = c[n];
+    if (r && r.meta.properties.length > 0)
       return !1;
   }
-  return !(K(t.key) && i.type === "comp" && a.meta.properties.length > 0);
+  return !(V(t.key) && i.type === "comp" && a.meta.properties.length > 0);
 }
 function Di(t, e, n) {
   const { properties: o } = g.runtime, { activeObject: i, activeComp: a, depends: c } = g.app;
   if (o[t.key] && o[t.key][e]) {
-    for (const { keys: u, raw: l } of o[t.key][e])
-      if (!Ce(u, l))
+    for (const { keys: r, raw: l } of o[t.key][e])
+      if (!Ce(r, l))
         return !1;
   }
-  if (Q(t.key) && n) {
-    const u = c[n];
-    if (u && u.meta.properties.length > 0)
+  if (J(t.key) && n) {
+    const r = c[n];
+    if (r && r.meta.properties.length > 0)
       return !1;
   }
-  if (z(t.key) && n) {
-    const u = c[n];
-    if (u && u.meta.properties.length > 0)
+  if (q(t.key) && n) {
+    const r = c[n];
+    if (r && r.meta.properties.length > 0)
       return !1;
   }
-  return !(K(t.key) && i.type === "comp" && a.meta.properties.length > 0);
+  return !(V(t.key) && i.type === "comp" && a.meta.properties.length > 0);
 }
 function Zn(t, e, n, o) {
   return t ? t === "onEvent" ? bi(e, n, o) : t === "callMethod" ? Pi(e, o) : t === "getProperty" ? Ri(e, n, o) : t === "setProperty" ? Di(e, n, o) : !1 : !1;
@@ -1132,7 +1167,7 @@ function X(t) {
   }
   return !1;
 }
-function Jt(t) {
+function qt(t) {
   const { activeObject: e } = g.app, n = [], o = Mt(e.type, e.subtype);
   if (!o)
     return n;
@@ -1151,7 +1186,7 @@ function Jt(t) {
   }
   return n;
 }
-function ft(t) {
+function mt(t) {
   const { activeObject: e } = g.app, n = e.nodes.find((i) => i.id === t);
   if (!n)
     return;
@@ -1168,16 +1203,16 @@ function ft(t) {
   };
 }
 function ke(t) {
-  const { i18n: e } = yt, n = [], o = Jt(t);
+  const { i18n: e } = kt, n = [], o = qt(t);
   for (const { id: i, name: a, alias: c } of o) {
-    let u = e.global.t(a);
-    c && (u += " / " + c), n.push([u, i]);
+    let r = e.global.t(a);
+    c && (r += " / " + c), n.push([r, i]);
   }
   return k(n);
 }
-function Ht(t, e) {
-  const { properties: n } = g.runtime, { activeObject: o, activeComp: i, depends: a } = g.app, c = [], u = Mt(o.type, o.subtype);
-  if (!u)
+function Gt(t, e) {
+  const { properties: n } = g.runtime, { activeObject: o, activeComp: i, depends: a } = g.app, c = [], r = Mt(o.type, o.subtype);
+  if (!r)
     return c;
   const l = o.nodes.find((d) => d.id === t);
   if (!l)
@@ -1185,10 +1220,10 @@ function Ht(t, e) {
   const _ = et[l.key];
   if (!_)
     return console.assert(!1, "invalid element", l.key), c;
-  if (n[_.key] && n[_.key][u])
-    for (const { keys: d, names: h, raw: p } of n[_.key][u])
+  if (n[_.key] && n[_.key][r])
+    for (const { keys: d, names: h, raw: p } of n[_.key][r])
       e === "write" && Ce(d, p) || c.push({
-        id: Zt("elementProperty", t, d),
+        id: te("elementProperty", t, d),
         kind: "elementProperty",
         names: h,
         meta: {
@@ -1196,12 +1231,12 @@ function Ht(t, e) {
           raw: p
         }
       });
-  if (Q(_.key) && l.reference && l.reference.comp) {
+  if (J(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, type: m } of d.meta.properties)
         c.push({
-          id: Zt("referenceProperty", t, h),
+          id: te("referenceProperty", t, h),
           kind: "referenceProperty",
           names: [p],
           meta: {
@@ -1209,12 +1244,12 @@ function Ht(t, e) {
           }
         });
   }
-  if (z(_.key) && l.reference && l.reference.comp) {
+  if (q(_.key) && l.reference && l.reference.comp) {
     const d = a[l.reference.comp];
     if (d)
       for (const { id: h, name: p, type: m } of d.meta.properties)
         c.push({
-          id: Zt("multipleRefProperty", t, h),
+          id: te("multipleRefProperty", t, h),
           kind: "multipleRefProperty",
           names: [p],
           meta: {
@@ -1222,10 +1257,10 @@ function Ht(t, e) {
           }
         });
   }
-  if (K(_.key) && o.type === "comp")
+  if (V(_.key) && o.type === "comp")
     for (const { id: d, name: h, type: p } of i.meta.properties)
       c.push({
-        id: Zt("customProperty", t, d),
+        id: te("customProperty", t, d),
         kind: "customProperty",
         names: [h],
         meta: {
@@ -1240,7 +1275,7 @@ function vt(t) {
   const { properties: e } = g.runtime, { activeObject: n, activeComp: o, depends: i } = g.app, a = Mt(n.type, n.subtype);
   if (!a)
     return;
-  const { kind: c, nodeId: u, propertyKey: l } = Jo(t), _ = n.nodes.find((h) => h.id === u);
+  const { kind: c, nodeId: r, propertyKey: l } = Jo(t), _ = n.nodes.find((h) => h.id === r);
   if (!_)
     return;
   const d = et[_.key];
@@ -1265,7 +1300,7 @@ function vt(t) {
         };
     }
   } else if (c === "referenceProperty") {
-    if (Q(d.key) && _.reference && _.reference.comp) {
+    if (J(d.key) && _.reference && _.reference.comp) {
       const h = i[_.reference.comp];
       if (h) {
         const p = h.meta.properties.find(
@@ -1283,7 +1318,7 @@ function vt(t) {
       }
     }
   } else if (c === "multipleRefProperty") {
-    if (z(d.key) && _.reference && _.reference.comp) {
+    if (q(d.key) && _.reference && _.reference.comp) {
       const h = i[_.reference.comp];
       if (h) {
         const p = h.meta.properties.find(
@@ -1300,7 +1335,7 @@ function vt(t) {
           };
       }
     }
-  } else if (c === "customProperty" && K(d.key) && n.type === "comp") {
+  } else if (c === "customProperty" && V(d.key) && n.type === "comp") {
     const h = o.meta.properties.find(
       (p) => p.id === l
     );
@@ -1316,7 +1351,7 @@ function vt(t) {
   }
 }
 function to(t, e) {
-  const n = [], o = Ht(t, e);
+  const n = [], o = Gt(t, e);
   for (const { id: i, kind: a, names: c } of o)
     n.push([Fn(a, c), i]);
   return k(n);
@@ -1357,7 +1392,7 @@ const Mi = {
   initData_: function() {
     if (this.node.id)
       return;
-    const t = Jt("onEvent")?.[0];
+    const t = qt("onEvent")?.[0];
     if (!t)
       return;
     this.node.id = t.id, this.node.key = t.key, this.node.alias = t.alias;
@@ -1398,7 +1433,7 @@ const Mi = {
     }
   },
   onNodeChange_: function(t) {
-    const e = ft(t);
+    const e = mt(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -1441,10 +1476,10 @@ const Mi = {
     let e = !0;
     (this.event.kind === "referenceEvent" || this.event.kind === "customEvent") && (e = !1), this.event.params.forEach(({ key: n, name: o }, i) => {
       t.push(["PARAM" + i, `__param$${n}__`, o, e]);
-    }), t.length > 0 && Y(this, t);
+    }), t.length > 0 && F(this, t);
   },
   checkWarning_: function() {
-    const t = ft(this.node.id);
+    const t = mt(this.node.id);
     if (!t) {
       this.setWarningText(f("WARN_NODE_NOT_FOUND"));
       return;
@@ -1474,8 +1509,8 @@ E.on_app_event_v1 = Mi;
 s.forBlock.on_app_event_v1 = function(t) {
   const e = s.quote_, n = t, o = n.event.id;
   let i = "";
-  n.event.params.forEach((u, l) => {
-    l !== 0 && (i += ", "), i += `__param$${u.key}__`;
+  n.event.params.forEach((r, l) => {
+    l !== 0 && (i += ", "), i += `__param$${r.key}__`;
   });
   const a = s.statementToCode(n, "HANDLE");
   return `__onEventV1__(${e(o)}, function(${i}) {
@@ -1543,14 +1578,14 @@ const Ui = {
       e.connection.setShadowDom(null);
       const n = e.connection.targetBlock();
       n && !n.isShadow() && n.dispose();
-      const { type: o } = this.event.params[t], i = Et(o);
+      const { type: o } = this.event.params[t], i = gt(o);
       e.setCheck(i);
     }
   },
   updateShadows_: function() {
     if (!this.isInsertionMarker())
       for (let t = 0; t < this.event.params.length; t++) {
-        const e = this.event.params[t], n = gt(e.type);
+        const e = this.event.params[t], n = At(e.type);
         this.getInput("PARAM" + t)?.connection?.setShadowDom(n);
       }
   },
@@ -1579,7 +1614,7 @@ s.forBlock.trigger_app_event_v1 = function(t) {
     const c = s.valueToCode(
       n,
       "PARAM" + a,
-      r.NONE
+      u.NONE
     );
     o && (o += ", "), o += c;
   }
@@ -1628,7 +1663,7 @@ T([
   }
 ]);
 s.forBlock.app_debug_trace_v1 = function(t) {
-  return `__debugTraceV1__(${s.valueToCode(t, "OBJECT", r.NONE)});
+  return `__debugTraceV1__(${s.valueToCode(t, "OBJECT", u.NONE)});
 `;
 };
 const Vi = {
@@ -1644,25 +1679,25 @@ const Vi = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_APP_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT").appendField("%{BKY_APP_RETURN}"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("TEXT") || (this.appendValueInput("TEXT").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_APP_TEXT}"), this.moveInputBefore("TEXT", "RESULT")), this.getInput("TITLE") || (this.appendValueInput("TITLE").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_APP_TITLE}"), this.moveInputBefore("TITLE", "TEXT"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_APP_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT").appendField("%{BKY_APP_RETURN}"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("TEXT") || (this.appendValueInput("TEXT").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_APP_TEXT}"), this.moveInputBefore("TEXT", "RESULT")), this.getInput("TITLE") || (this.appendValueInput("TITLE").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_APP_TITLE}"), this.moveInputBefore("TITLE", "TEXT"));
   },
   updateShadow_: function() {
     if (this.isInsertionMarker())
       return;
-    const t = pt("title");
+    const t = dt("title");
     this.getInput("TITLE").connection.setShadowDom(t);
-    const e = pt("text");
+    const e = dt("text");
     this.getInput("TEXT").connection.setShadowDom(e);
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || Y(this, [
+    this.isInsertionMarker() || F(this, [
       ["RESULT", "__result__", "x-runtime-lib.result", !0]
     ]);
   }
 };
 E.open_confirm_dlg_v1 = Vi;
 s.forBlock.open_confirm_dlg_v1 = function(t) {
-  const e = s.valueToCode(t, "TITLE", r.ATOMIC), n = s.valueToCode(t, "TEXT", r.ATOMIC), o = s.statementToCode(t, "HANDLE");
+  const e = s.valueToCode(t, "TITLE", u.ATOMIC), n = s.valueToCode(t, "TEXT", u.ATOMIC), o = s.statementToCode(t, "HANDLE");
   return `{
   var __result__ = __openConfirmDlgV1__(${e}, ${n});
 ${o}}
@@ -1681,27 +1716,27 @@ const xi = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_APP_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT").appendField("%{BKY_APP_RETURN}"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("VALUE") || (this.appendValueInput("VALUE").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_APP_VALUE}"), this.moveInputBefore("VALUE", "RESULT")), this.getInput("LABEL") || (this.appendValueInput("LABEL").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_APP_LABEL}"), this.moveInputBefore("LABEL", "VALUE")), this.getInput("TITLE") || (this.appendValueInput("TITLE").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_APP_TITLE}"), this.moveInputBefore("TITLE", "LABEL"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_APP_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT").appendField("%{BKY_APP_RETURN}"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("VALUE") || (this.appendValueInput("VALUE").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_APP_VALUE}"), this.moveInputBefore("VALUE", "RESULT")), this.getInput("LABEL") || (this.appendValueInput("LABEL").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_APP_LABEL}"), this.moveInputBefore("LABEL", "VALUE")), this.getInput("TITLE") || (this.appendValueInput("TITLE").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_APP_TITLE}"), this.moveInputBefore("TITLE", "LABEL"));
   },
   updateShadow_: function() {
     if (this.isInsertionMarker())
       return;
-    const t = pt("title");
+    const t = dt("title");
     this.getInput("TITLE").connection.setShadowDom(t);
-    const e = pt("label");
+    const e = dt("label");
     this.getInput("LABEL").connection.setShadowDom(e);
-    const n = pt("");
+    const n = dt("");
     this.getInput("VALUE").connection.setShadowDom(n);
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || Y(this, [
+    this.isInsertionMarker() || F(this, [
       ["RESULT", "__result__", "x-runtime-lib.result", !0]
     ]);
   }
 };
 E.open_prompt_dlg_v1 = xi;
 s.forBlock.open_prompt_dlg_v1 = function(t) {
-  const e = s.valueToCode(t, "TITLE", r.ATOMIC), n = s.valueToCode(t, "LABEL", r.ATOMIC), o = s.valueToCode(t, "VALUE", r.ATOMIC), i = s.statementToCode(t, "HANDLE");
+  const e = s.valueToCode(t, "TITLE", u.ATOMIC), n = s.valueToCode(t, "LABEL", u.ATOMIC), o = s.valueToCode(t, "VALUE", u.ATOMIC), i = s.statementToCode(t, "HANDLE");
   return `{
   var __result__ = __openPromptDlgV1__(${e}, ${n}, ${o});
 ${i}}
@@ -1735,7 +1770,7 @@ T([
   }
 ]);
 s.forBlock.popup_message_v1 = function(t) {
-  const e = s.quote_(t.getFieldValue("TYPE")), n = s.valueToCode(t, "TEXT", r.ATOMIC);
+  const e = s.quote_(t.getFieldValue("TYPE")), n = s.valueToCode(t, "TEXT", u.ATOMIC);
   return `__messageV1__(${e}, ${n});
 `;
 };
@@ -1759,7 +1794,7 @@ const Yi = {
   initData_: function() {
     if (this.node.id)
       return;
-    const t = Jt("callMethod")?.[0];
+    const t = qt("callMethod")?.[0];
     if (!t)
       return;
     this.node.id = t.id, this.node.key = t.key, this.node.alias = t.alias;
@@ -1800,7 +1835,7 @@ const Yi = {
     }
   },
   onNodeChange_: function(t) {
-    const e = ft(t);
+    const e = mt(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -1836,10 +1871,10 @@ const Yi = {
       this.removeInput("INPUT" + t);
     for (let t = 0; t < this.method.inputs.length; t++) {
       const e = this.method.inputs[t];
-      this.getInput("INPUT" + t) || (this.appendValueInput("INPUT" + t).setAlign(y.Align.RIGHT).appendField(f(e.name)), this.method.outputs.length > 0 && this.moveInputBefore("INPUT" + t, "OUTPUT0"));
+      this.getInput("INPUT" + t) || (this.appendValueInput("INPUT" + t).setAlign(v.Align.RIGHT).appendField(f(e.name)), this.method.outputs.length > 0 && this.moveInputBefore("INPUT" + t, "OUTPUT0"));
     }
     if (this.method.kind === "multipleRefMethod")
-      this.getInput("REF_KEY") || this.appendValueInput("REF_KEY").setAlign(y.Align.RIGHT).appendField(f("BKY_APP_REF_KEY")), this.method.inputs.length > 0 ? this.moveInputBefore("REF_KEY", "INPUT0") : this.method.outputs.length > 0 && this.moveInputBefore("REF_KEY", "OUTPUT0");
+      this.getInput("REF_KEY") || this.appendValueInput("REF_KEY").setAlign(v.Align.RIGHT).appendField(f("BKY_APP_REF_KEY")), this.method.inputs.length > 0 ? this.moveInputBefore("REF_KEY", "INPUT0") : this.method.outputs.length > 0 && this.moveInputBefore("REF_KEY", "OUTPUT0");
     else if (this.getInput("REF_KEY")) {
       const t = this.getInput("REF_KEY").connection.targetBlock();
       t && t.dispose(), this.removeInput("REF_KEY");
@@ -1851,7 +1886,7 @@ const Yi = {
         const e = this.method.inputs[t];
         if (!e.type)
           continue;
-        const n = gt(e.type);
+        const n = At(e.type);
         this.getInput("INPUT" + t).setShadowDom(n);
       }
   },
@@ -1863,10 +1898,10 @@ const Yi = {
       const { key: i, name: a } = this.method.outputs[o];
       n.push(["OUTPUT" + o, `__output$${i}__`, a, e]);
     }
-    n.length > 0 && Y(this, n);
+    n.length > 0 && F(this, n);
   },
   checkWarning_: function() {
-    const t = ft(this.node.id);
+    const t = mt(this.node.id);
     if (!t) {
       this.setWarningText(f("WARN_NODE_NOT_FOUND"));
       return;
@@ -1900,16 +1935,16 @@ E.call_app_method_v1 = Yi;
 s.forBlock.call_app_method_v1 = function(t) {
   const e = s.INDENT, n = s.quote_, o = t;
   let i;
-  o.method.kind === "multipleRefMethod" && (i = s.valueToCode(o, "REF_KEY", r.NONE) || "''");
+  o.method.kind === "multipleRefMethod" && (i = s.valueToCode(o, "REF_KEY", u.NONE) || "''");
   let a = "{";
-  if (o.method.inputs.forEach(({ key: c, type: u }, l) => {
+  if (o.method.inputs.forEach(({ key: c, type: r }, l) => {
     let _ = s.valueToCode(
       o,
       "INPUT" + l,
-      r.ATOMIC
+      u.ATOMIC
     );
     if (_ === void 0)
-      switch (u) {
+      switch (r) {
         case "string":
           _ = "''";
           break;
@@ -1935,10 +1970,11 @@ s.forBlock.call_app_method_v1 = function(t) {
       c += `${e}__output$${_}__ = __outputs__[${n(_)}];
 `;
     });
-    const u = s.statementToCode(o, "HANDLE");
+    const r = s.statementToCode(o, "HANDLE");
     return `{
   var __outputs__ = __callMethodV1__(${n(o.method.id)}, ${i}, ${a});
-${c}${u}}
+  __messageV1__('error', __outputs__);
+${c}${r}}
 `;
   } else
     return `__callMethodV1__(${n(o.method.id)}, ${i}, ${a});
@@ -2009,7 +2045,7 @@ const Fi = {
       const { key: o, name: i } = this.method.inputs[n];
       e.push(["INPUT" + n, `__input$${o}__`, i, t]);
     }
-    Y(this, e);
+    F(this, e);
   },
   checkWarning_: function() {
     const t = Dt(this.method.id);
@@ -2128,13 +2164,13 @@ const wi = {
     t.connection.setShadowDom(null);
     const e = t.connection.targetBlock();
     e && !e.isShadow() && e.dispose();
-    const n = Et(this.output.type);
+    const n = gt(this.output.type);
     t.setCheck(n);
   },
   updateShadows_: function() {
     if (this.isInsertionMarker())
       return;
-    const t = gt(this.output.type);
+    const t = At(this.output.type);
     this.getInput("VALUE").connection.setShadowDom(t);
   },
   checkWarning_: function() {
@@ -2148,7 +2184,10 @@ const wi = {
       return;
     }
     t.names !== this.method.names && (this.method.names = t.names);
-    const e = Ke(this.method.id, this.output.key);
+    const e = Ke(
+      this.method.id,
+      this.output.key
+    );
     if (!e) {
       this.setWarningText(f("WARN_OUTPUT_NOT_FOUND"));
       return;
@@ -2163,7 +2202,7 @@ const wi = {
 E.set_app_method_output_v1 = wi;
 s.forBlock.set_app_method_output_v1 = function(t) {
   const e = s.quote_, n = t;
-  let o = s.valueToCode(n, "VALUE", r.ATOMIC);
+  let o = s.valueToCode(n, "VALUE", u.ATOMIC);
   if (o === void 0)
     switch (n.output.type) {
       case "string":
@@ -2208,7 +2247,7 @@ T([
   }
 ]);
 s.forBlock.app_env_is_v1 = function(t) {
-  return [`__getEnvV1__() === ${s.quote_(t.getFieldValue("ENV"))}`, r.ATOMIC];
+  return [`__getEnvV1__() === ${s.quote_(t.getFieldValue("ENV"))}`, u.ATOMIC];
 };
 const Ki = {
   init: function() {
@@ -2248,7 +2287,7 @@ const Ki = {
     }, 0);
   },
   genAppOpts_: function() {
-    return yi();
+    return vi();
   },
   genPageOpts_: function() {
     return Ci(this.app.id);
@@ -2264,7 +2303,7 @@ const Ki = {
     }
   },
   onAppChange_: function(t) {
-    const e = yn(t);
+    const e = vn(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -2282,7 +2321,7 @@ const Ki = {
     e ? (this.page.id = e.id, this.page.name = e.name) : (this.page.id = "", this.page.name = "");
   },
   checkWarning_: function() {
-    const t = yn(this.app.id);
+    const t = vn(this.app.id);
     if (!t) {
       this.setWarningText(f("WARN_APP_NOT_FOUND"));
       return;
@@ -2365,7 +2404,7 @@ const $i = {
 E.select_comp_v1 = $i;
 s.forBlock.select_comp_v1 = function(t) {
   const e = s.quote_, o = t.comp.id ?? "";
-  return [e(o), r.ATOMIC];
+  return [e(o), u.ATOMIC];
 };
 const Hi = {
   init: function() {
@@ -2385,13 +2424,13 @@ const Hi = {
   initData_: function() {
     if (this.node.id)
       return;
-    const t = Jt("getProperty")?.[0];
+    const t = qt("getProperty")?.[0];
     if (!t)
       return;
     this.node.id = t.id, this.node.key = t.key, this.node.alias = t.alias;
     const e = this.getField("NODE");
     e.getOptions(!1), e.setValue(this.node.id);
-    const n = Ht(this.node.id, "read")?.[0];
+    const n = Gt(this.node.id, "read")?.[0];
     if (!n)
       return;
     this.property.id = n.id, this.property.kind = n.kind, this.property.names = n.names;
@@ -2426,7 +2465,7 @@ const Hi = {
     }
   },
   onNodeChange_: function(t) {
-    const e = ft(t);
+    const e = mt(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -2435,7 +2474,7 @@ const Hi = {
     this.node.id = e.id, this.node.key = e.key, this.node.alias = e.alias;
     const o = this.getField("PROPERTY");
     if (o.getOptions(!1), n || !vt(this.property.id)) {
-      const i = Ht(this.node.id, "read")?.[0];
+      const i = Gt(this.node.id, "read")?.[0];
       o.setValue(i?.id ?? "");
     }
     this.onPropChange_(o.getValue());
@@ -2445,7 +2484,7 @@ const Hi = {
     e ? (this.property.id = e.id, this.property.kind = e.kind, this.property.names = e.names) : (this.property.id = "", this.property.kind = "", this.property.names = []);
   },
   checkWarning_: function() {
-    const t = ft(this.node.id);
+    const t = mt(this.node.id);
     if (!t) {
       this.setWarningText(f("WARN_NODE_NOT_FOUND"));
       return;
@@ -2470,7 +2509,7 @@ const Hi = {
 E.get_app_property_v1 = Hi;
 s.forBlock.get_app_property_v1 = function(t) {
   const e = s.quote_;
-  return [`__getPropertyV1__(${e(t.property.id)}, ${e("")})`, r.ATOMIC];
+  return [`__getPropertyV1__(${e(t.property.id)}, ${e("")})`, u.ATOMIC];
 };
 const Gi = {
   init: function() {
@@ -2490,13 +2529,13 @@ const Gi = {
   initData_: function() {
     if (this.node.id)
       return;
-    const t = Jt("setProperty")?.[0];
+    const t = qt("setProperty")?.[0];
     if (!t)
       return;
     this.node.id = t.id, this.node.key = t.key, this.node.alias = t.alias;
     const e = this.getField("NODE");
     e.getOptions(!1), e.setValue(this.node.id);
-    const n = Ht(this.node.id, "write")?.[0];
+    const n = Gt(this.node.id, "write")?.[0];
     if (!n)
       return;
     this.property.id = n.id, this.property.kind = n.kind, this.property.names = n.names;
@@ -2531,7 +2570,7 @@ const Gi = {
     }
   },
   onNodeChange_: function(t) {
-    const e = ft(t);
+    const e = mt(t);
     if (!e) {
       console.assert(!1);
       return;
@@ -2540,7 +2579,7 @@ const Gi = {
     this.node.id = e.id, this.node.key = e.key, this.node.alias = e.alias;
     const o = this.getField("PROPERTY");
     if (o.getOptions(!1), n || !vt(this.property.id)) {
-      const i = Ht(this.node.id, "write")?.[0];
+      const i = Gt(this.node.id, "write")?.[0];
       o.setValue(i?.id ?? "");
     }
     this.onPropChange_(o.getValue());
@@ -2561,12 +2600,12 @@ const Gi = {
       const n = ci(t.meta.raw), o = hi(t.meta.raw);
       this.getInput("VALUE").setCheck(n).setShadowDom(o);
     } else {
-      const n = Et(t.meta.raw.type), o = gt(t.meta.raw.type);
+      const n = gt(t.meta.raw.type), o = At(t.meta.raw.type);
       this.getInput("VALUE").setCheck(n).setShadowDom(o);
     }
   },
   checkWarning_: function() {
-    const t = ft(this.node.id);
+    const t = mt(this.node.id);
     if (!t) {
       this.setWarningText(f("WARN_NODE_NOT_FOUND"));
       return;
@@ -2590,7 +2629,7 @@ const Gi = {
 };
 E.set_app_property_v1 = Gi;
 s.forBlock.set_app_property_v1 = function(t) {
-  const e = s.quote_, n = t, o = "", i = s.valueToCode(n, "VALUE", r.NONE);
+  const e = s.quote_, n = t, o = "", i = s.valueToCode(n, "VALUE", u.NONE);
   return `__setPropertyV1__(${e(n.property.id)}, ${e(o)}, ${i});
 `;
 };
@@ -2656,7 +2695,7 @@ const Wi = {
 E.get_app_state_v1 = Wi;
 s.forBlock.get_app_state_v1 = function(t) {
   const e = s.quote_;
-  return [`__getStateV1__(${e(t.state.id)})`, r.ATOMIC];
+  return [`__getStateV1__(${e(t.state.id)})`, u.ATOMIC];
 };
 const ji = {
   init: function() {
@@ -2706,7 +2745,7 @@ const ji = {
     this.getInput("VALUE").setShadowDom(null);
     const t = this.getInput("VALUE").connection.targetBlock();
     t && t.dispose();
-    const e = Et(this.state.type), n = gt(this.state.type);
+    const e = gt(this.state.type), n = At(this.state.type);
     this.getInput("VALUE").setCheck(e).setShadowDom(n);
   },
   checkWarning_: function() {
@@ -2724,7 +2763,7 @@ const ji = {
 };
 E.set_app_state_v1 = ji;
 s.forBlock.set_app_state_v1 = function(t) {
-  const e = s.quote_, n = t, o = s.valueToCode(n, "VALUE", r.NONE);
+  const e = s.quote_, n = t, o = s.valueToCode(n, "VALUE", u.NONE);
   return `__setStateV1__(${e(n.state.id)}, ${o});
 `;
 };
@@ -2759,7 +2798,7 @@ T([
   }
 ]);
 s.forBlock.color_blend_v1 = function(t) {
-  const e = s.valueToCode(t, "COLOR1", r.NONE) || "'#ffffff'", n = s.valueToCode(t, "COLOR2", r.NONE) || "'#000000'", o = s.valueToCode(t, "RATIO", r.NONE) || 0.5;
+  const e = s.valueToCode(t, "COLOR1", u.NONE) || "'#ffffff'", n = s.valueToCode(t, "COLOR2", u.NONE) || "'#000000'", o = s.valueToCode(t, "RATIO", u.NONE) || 0.5;
   return [`${s.provideFunction_(
     "colorBlend",
     `
@@ -2780,7 +2819,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
   return '#' + r + g + b;
 }
 `
-  )}(${e}, ${n}, ${o})`, r.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -3361,7 +3400,7 @@ T([
   }
 ]);
 s.forBlock.color_picker_v1 = function(t) {
-  return [s.quote_(t.getFieldValue("COLOR")), r.ATOMIC];
+  return [s.quote_(t.getFieldValue("COLOR")), u.ATOMIC];
 };
 T([
   {
@@ -3382,7 +3421,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}() {
   return '#' + ('00000' + num.toString(16)).substr(-6);
 }
 `
-  )}()`, r.FUNCTION_CALL];
+  )}()`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -3415,7 +3454,7 @@ T([
   }
 ]);
 s.forBlock.color_rgb_v1 = function(t) {
-  const e = s.valueToCode(t, "RED", r.NONE) || 0, n = s.valueToCode(t, "GREEN", r.NONE) || 0, o = s.valueToCode(t, "BLUE", r.NONE) || 0;
+  const e = s.valueToCode(t, "RED", u.NONE) || 0, n = s.valueToCode(t, "GREEN", u.NONE) || 0, o = s.valueToCode(t, "BLUE", u.NONE) || 0;
   return [`${s.provideFunction_(
     "colorRgb",
     `
@@ -3429,7 +3468,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
   return '#' + r + g + b;
 }
 `
-  )}(${e}, ${n}, ${o})`, r.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 const Xi = C.xml, Ji = [
   {
@@ -3550,7 +3589,7 @@ const Qi = {
   },
   updateShape_: function() {
     if (this.locale) {
-      const { i18n: t } = yt;
+      const { i18n: t } = kt;
       this.setFieldValue(t.global.t(this.name), "LABEL");
     } else
       this.setFieldValue(this.name, "LABEL");
@@ -3558,7 +3597,7 @@ const Qi = {
 };
 E.parameter_v1 = Qi;
 s.forBlock.parameter_v1 = function(t) {
-  return [t.key, r.ATOMIC];
+  return [t.key, u.ATOMIC];
 };
 const zi = {
   init: function() {
@@ -3569,18 +3608,18 @@ s.forBlock.on_flow_state_event_v1 = function() {
   return `__onFlowStateEventV1__();
 `;
 };
-function Gt(t) {
+function Wt(t) {
   const e = g.compute.spaces.find((n) => n.id === t);
   return e ? e.funcs : [];
 }
-function Bt(t, e) {
+function Pt(t, e) {
   const n = g.compute.spaces.find((o) => o.id === t);
   if (n)
     return n.funcs.find((o) => o.id === e);
 }
 function no(t) {
   const e = [];
-  return Gt(t).forEach(({ id: o, name: i }) => {
+  return Wt(t).forEach(({ id: o, name: i }) => {
     e.push([i, o]);
   }), k(e);
 }
@@ -3597,7 +3636,7 @@ function Zi() {
     t.push([o, n]);
   }), k(t);
 }
-function qt(t) {
+function Qt(t) {
   const e = [];
   return g.compute.spaces.forEach((n) => {
     t === "func" && n.funcs.length > 0 && e.push(n), t === "flow" && n.flows.length > 0 && e.push(n);
@@ -3608,7 +3647,7 @@ function le(t) {
 }
 function oo(t) {
   const e = [];
-  return qt(t).forEach(({ id: o, name: i }) => {
+  return Qt(t).forEach(({ id: o, name: i }) => {
     e.push([i, o]);
   }), k(e);
 }
@@ -3630,13 +3669,13 @@ const ts = {
   initData_: function() {
     if (this.space.id)
       return;
-    const t = qt("func")?.[0];
+    const t = Qt("func")?.[0];
     if (!t)
       return;
     this.space.id = t.id, this.space.name = t.name;
     const e = this.getField("SPACE");
     e.getOptions(!1), e.setValue(this.space.id);
-    const n = Gt(this.space.id)?.[0];
+    const n = Wt(this.space.id)?.[0];
     if (!n)
       return;
     this.func.id = n.id, this.func.name = n.name, this.func.inputs = n.inputs, this.func.outputs = n.outputs;
@@ -3677,13 +3716,13 @@ const ts = {
       return;
     }
     let n = !1;
-    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("FUNC").getOptions(!1), n || !Bt(this.space.id, this.func.id)) {
-      const i = Gt(this.space.id)?.[0];
+    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("FUNC").getOptions(!1), n || !Pt(this.space.id, this.func.id)) {
+      const i = Wt(this.space.id)?.[0];
       this.setFieldValue(i?.id ?? "", "FUNC");
     }
   },
   onFuncChange_: function(t) {
-    const e = Bt(this.space.id, t);
+    const e = Pt(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -3710,19 +3749,19 @@ const ts = {
     }
     for (let t = 0; t < this.func.inputs.length; t++) {
       const { name: e } = this.func.inputs[t], n = this.getInput("INPUT" + t);
-      n ? (this.setFieldValue(e, "NAME" + t), n.setCheck(null)) : (this.appendValueInput("INPUT" + t).setAlign(y.Align.RIGHT).appendField(e, "NAME" + t).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + t, "OUTPUT0") : this.moveInputBefore("INPUT" + t, "CALLBACK"));
+      n ? (this.setFieldValue(e, "NAME" + t), n.setCheck(null)) : (this.appendValueInput("INPUT" + t).setAlign(v.Align.RIGHT).appendField(e, "NAME" + t).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + t, "OUTPUT0") : this.moveInputBefore("INPUT" + t, "CALLBACK"));
     }
   },
   updateCheck_: function() {
     for (let t = 0; t < this.func.inputs.length; t++) {
-      const { type: e } = this.func.inputs[t], n = Et(e);
+      const { type: e } = this.func.inputs[t], n = gt(e);
       this.getInput("INPUT" + t).connection.setCheck(n);
     }
   },
   updateShadow_: function() {
     if (!this.isInsertionMarker())
       for (let t = 0; t < this.func.inputs.length; t++) {
-        const e = this.func.inputs[t], n = gt(e.type);
+        const e = this.func.inputs[t], n = At(e.type);
         this.getInput("INPUT" + t).setShadowDom(n);
       }
   },
@@ -3734,7 +3773,7 @@ const ts = {
       const { id: n, name: o } = this.func.outputs[e];
       t.push(["OUTPUT" + e, `__output$${n}__`, o, !1]);
     }
-    Y(this, t);
+    F(this, t);
   },
   checkWarning_: function() {
     const t = le(this.space.id);
@@ -3743,7 +3782,7 @@ const ts = {
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = Bt(this.space.id, this.func.id);
+    const e = Pt(this.space.id, this.func.id);
     if (!e) {
       this.setWarningText(f("WARN_FUNC_NOT_FOUND"));
       return;
@@ -3768,12 +3807,12 @@ s.forBlock.call_func_v1 = function(t) {
     const m = s.valueToCode(
       o,
       "INPUT" + p,
-      r.ATOMIC
+      u.ATOMIC
     );
     c += `${e}${e}${n(h)}: ${m},
 `;
   }), c += `${e}};`;
-  const u = n(o.space.name + "/" + o.func.name);
+  const r = n(o.space.name + "/" + o.func.name);
   let l = "";
   o.func.outputs.forEach(({ id: h }) => {
     l += `${e}var __output${h}__ = __result__[${n(h)}];
@@ -3782,7 +3821,7 @@ s.forBlock.call_func_v1 = function(t) {
   const _ = s.statementToCode(o, "CALLBACK");
   return `{
 ${c}
-${e}var __result__ = __callFuncV1__(${i},${a},__inputs__,__getEnvV1__(),${u});
+${e}var __result__ = __callFuncV1__(${i},${a},__inputs__,__getEnvV1__(),${r});
 ${l}${_}}
 `;
 };
@@ -3804,13 +3843,13 @@ const es = {
   initData_: function() {
     if (this.space.id)
       return;
-    const t = qt("func")?.[0];
+    const t = Qt("func")?.[0];
     if (!t)
       return;
     this.space.id = t.id, this.space.name = t.name;
     const e = this.getField("SPACE");
     e.getOptions(!1), e.setValue(this.space.id);
-    const n = Gt(this.space.id)?.[0];
+    const n = Wt(this.space.id)?.[0];
     if (!n)
       return;
     this.func.id = n.id, this.func.name = n.name, this.func.inputs = n.inputs, this.func.outputs = n.outputs;
@@ -3851,13 +3890,13 @@ const es = {
       return;
     }
     let n = !1;
-    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("FUNC").getOptions(!1), n || !Bt(this.space.id, this.func.id)) {
-      const i = Gt(this.space.id)?.[0];
+    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("FUNC").getOptions(!1), n || !Pt(this.space.id, this.func.id)) {
+      const i = Wt(this.space.id)?.[0];
       i ? this.setFieldValue(i.id, "FUNC") : this.setFieldValue("", "FUNC");
     }
   },
   onFuncChange_: function(t) {
-    const e = Bt(this.space.id, t);
+    const e = Pt(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -3884,19 +3923,19 @@ const es = {
     }
     for (let t = 0; t < this.func.inputs.length; t++) {
       const { name: e } = this.func.inputs[t], n = this.getInput("INPUT" + t);
-      n ? (this.setFieldValue(e, "NAME" + t), n.setCheck(null)) : (this.appendValueInput("INPUT" + t).setAlign(y.Align.RIGHT).appendField(e, "NAME" + t).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + t, "OUTPUT0") : this.moveInputBefore("INPUT" + t, "CALLBACK"));
+      n ? (this.setFieldValue(e, "NAME" + t), n.setCheck(null)) : (this.appendValueInput("INPUT" + t).setAlign(v.Align.RIGHT).appendField(e, "NAME" + t).setCheck(null), this.getInput("OUTPUT0") ? this.moveInputBefore("INPUT" + t, "OUTPUT0") : this.moveInputBefore("INPUT" + t, "CALLBACK"));
     }
   },
   updateCheck_: function() {
     for (let t = 0; t < this.func.inputs.length; t++) {
-      const { type: e } = this.func.inputs[t], n = Et(e);
+      const { type: e } = this.func.inputs[t], n = gt(e);
       this.getInput("INPUT" + t).connection.setCheck(n);
     }
   },
   updateShadow_: function() {
     if (!this.isInsertionMarker())
       for (let t = 0; t < this.func.inputs.length; t++) {
-        const e = this.func.inputs[t], n = gt(e.type);
+        const e = this.func.inputs[t], n = At(e.type);
         this.getInput("INPUT" + t).setShadowDom(n);
       }
   },
@@ -3908,7 +3947,7 @@ const es = {
       const { id: n, name: o } = this.func.outputs[e];
       t.push(["OUTPUT" + e, `__output$${n}__`, o, !1]);
     }
-    Y(this, t);
+    F(this, t);
   },
   checkWarning_: function() {
     const t = le(this.space.id);
@@ -3917,7 +3956,7 @@ const es = {
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = Bt(this.space.id, this.func.id);
+    const e = Pt(this.space.id, this.func.id);
     if (!e) {
       this.setWarningText(f("WARN_FUNC_NOT_FOUND"));
       return;
@@ -3942,12 +3981,12 @@ s.forBlock.call_func_internal_v1 = function(t) {
     const m = s.valueToCode(
       o,
       "INPUT" + p,
-      r.ATOMIC
+      u.ATOMIC
     );
     c += `${e}${e}${n(h)}: ${m},
 `;
   }), c += `${e}};`;
-  const u = o.space.name + "/" + o.func.name;
+  const r = o.space.name + "/" + o.func.name;
   let l = "";
   o.func.outputs.forEach(({ id: h }) => {
     l += `${e}var __output$${h}__ = __result__.outputs[${n(h)}];
@@ -3958,7 +3997,7 @@ s.forBlock.call_func_internal_v1 = function(t) {
 ${c}
 ${e}var __result__ = __callFuncInternalV1__(${i}, ${a}, __inputs__);
 ${e}if (!__result__.success) {
-${e}${e}throw 'call func<${u}> failed, reason: ' + __result__.message;
+${e}${e}throw 'call func<${r}> failed, reason: ' + __result__.message;
 ${e}}
 ${l}${_}}
 `;
@@ -4007,7 +4046,7 @@ const ns = {
       const { id: n, name: o } = this.func.inputs[e];
       t.push(["INPUT" + e, `__input$${n}__`, o, !1]);
     }
-    Y(this, t);
+    F(this, t);
   },
   checkWarning_: function() {
     const { id: t, inputs: e } = tn();
@@ -4081,13 +4120,13 @@ const os = {
     t.connection.setShadowDom(null);
     const e = t.connection.targetBlock();
     e && !e.isShadow() && e.dispose();
-    const n = Et(this.output.type);
+    const n = gt(this.output.type);
     t.setCheck(n);
   },
   updateShadows_: function() {
     if (this.isInsertionMarker())
       return;
-    const t = gt(this.output.type);
+    const t = At(this.output.type);
     this.getInput("VALUE").setShadowDom(t);
   },
   checkWarning_: function() {
@@ -4106,7 +4145,7 @@ const os = {
 E.set_func_output_v1 = os;
 s.forBlock.set_func_output_v1 = function(t) {
   const e = s.quote_, n = t, { id: o, type: i } = n.output;
-  let a = s.valueToCode(n, "VALUE", r.ATOMIC);
+  let a = s.valueToCode(n, "VALUE", u.ATOMIC);
   if (a === void 0)
     switch (i) {
       case "string":
@@ -4149,7 +4188,7 @@ T([
   }
 ]);
 s.forBlock.compute_debug_trace_v1 = function(t) {
-  return `__debugTraceV1__(${s.valueToCode(t, "OBJECT", r.ATOMIC)});
+  return `__debugTraceV1__(${s.valueToCode(t, "OBJECT", u.ATOMIC)});
 `;
 };
 T([
@@ -4173,7 +4212,7 @@ T([
   }
 ]);
 s.forBlock.compute_env_is_v1 = function(t) {
-  return [`__getEnvV1__() === ${s.quote_(t.getFieldValue("ENV"))}`, r.ATOMIC];
+  return [`__getEnvV1__() === ${s.quote_(t.getFieldValue("ENV"))}`, u.ATOMIC];
 };
 function nt() {
   const t = [];
@@ -4181,7 +4220,7 @@ function nt() {
     e.tables.length > 0 && t.push(e);
   }), t;
 }
-function mt(t) {
+function Tt(t) {
   const { spaces: e } = g.data;
   return e.find((n) => n.id === t);
 }
@@ -4195,7 +4234,7 @@ function H(t) {
   const { spaces: e } = g.data, n = e.find((o) => o.id === t);
   return n ? n.tables : [];
 }
-function q(t, e) {
+function z(t, e) {
   const { spaces: n } = g.data, o = n.find((i) => i.id === t);
   if (o)
     return o.tables.find((i) => i.id === e);
@@ -4234,22 +4273,22 @@ function ss(t) {
   let n, o;
   const i = nt()?.[0];
   if (i) {
-    const u = H(i.id)?.[0];
-    if (u) {
+    const r = H(i.id)?.[0];
+    if (r) {
       n = {
         space: {
           id: i.id,
           name: i.name
         },
         table: {
-          id: u.id,
-          name: u.name,
-          columns: u.columns
+          id: r.id,
+          name: r.name,
+          columns: r.columns
         },
-        itemCount: u.columns.length
+        itemCount: r.columns.length
       }, o = {};
-      for (let l = 0; l < u.columns.length; l++) {
-        const _ = u.columns[l];
+      for (let l = 0; l < r.columns.length; l++) {
+        const _ = r.columns[l];
         o["COLUMN" + l] = _.id;
       }
     }
@@ -4298,10 +4337,10 @@ const cs = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("UpdateColumn").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "SUCCESS"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("UpdateColumn").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "SUCCESS"));
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || (ss(this), Y(this, [
+    this.isInsertionMarker() || (ss(this), F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0],
       ["DATA", "__data__", "x-runtime-lib.data", !0]
@@ -4310,7 +4349,7 @@ const cs = {
 };
 E.add_data_v1 = cs;
 s.forBlock.add_data_v1 = function(t) {
-  const e = s.INDENT, n = s.valueToCode(t, "TABLE", r.ATOMIC) || "null", o = s.statementToCode(t, "HANDLE");
+  const e = s.INDENT, n = s.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = s.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -4406,19 +4445,19 @@ const rs = {
     }
   },
   onSpaceChange_: function(t) {
-    const e = mt(t);
+    const e = Tt(t);
     if (!e) {
       console.assert(!1);
       return;
     }
     const n = e.id !== this.space.id;
-    if (this.space.id = e.id, this.space.name = e.name, n || !q(this.space.id, this.table.id)) {
+    if (this.space.id = e.id, this.space.name = e.name, n || !z(this.space.id, this.table.id)) {
       const o = H(this.space.id)?.[0]?.id ?? "", i = this.getField("TABLE");
       i.getOptions(!1), i.setValue(o, !1), this.onTableChange_(o);
     }
   },
   onTableChange_: function(t) {
-    const e = q(this.space.id, t);
+    const e = z(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -4457,13 +4496,13 @@ const rs = {
     this.getInput("VALUE").connection.setCheck(t);
   },
   checkWarning_: function() {
-    const t = mt(this.space.id);
+    const t = Tt(this.space.id);
     if (!t) {
       this.setWarningText(f("WARN_SPACE_NOT_FOUND"));
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = q(this.space.id, this.table.id);
+    const e = z(this.space.id, this.table.id);
     if (!e) {
       this.setWarningText(f("WARN_TABLE_NOT_FOUND"));
       return;
@@ -4487,7 +4526,7 @@ const rs = {
 };
 E.cond_atomic_v1 = rs;
 s.forBlock.cond_atomic_v1 = function(t) {
-  const e = s.quote_, n = t, o = n.column.name, i = s.valueToCode(n, "VALUE", r.ATOMIC) || null, c = {
+  const e = s.quote_, n = t, o = n.column.name, i = s.valueToCode(n, "VALUE", u.ATOMIC) || null, c = {
     EQ: "=",
     NEQ: "!=",
     LT: "<",
@@ -4495,7 +4534,7 @@ s.forBlock.cond_atomic_v1 = function(t) {
     GT: ">",
     GTE: ">="
   }[n.getFieldValue("OP")];
-  return [`{type:'ATOMIC',key:${e(o)},value:${i},operator:${e(c)}}`, r.ATOMIC];
+  return [`{type:'ATOMIC',key:${e(o)},value:${i},operator:${e(c)}}`, u.ATOMIC];
 };
 const us = {
   init: function() {
@@ -4518,7 +4557,7 @@ const _s = {
       ]),
       "TYPE"
     ), this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["cond_logic_item_v1"],
         this
       )
@@ -4585,13 +4624,13 @@ const _s = {
 };
 E.cond_logic_v1 = _s;
 s.forBlock.cond_logic_v1 = function(t) {
-  const e = s.quote_, n = t, o = n.getFieldValue("TYPE"), i = [], a = s.valueToCode(n, "VALUE", r.ATOMIC) || null;
+  const e = s.quote_, n = t, o = n.getFieldValue("TYPE"), i = [], a = s.valueToCode(n, "VALUE", u.ATOMIC) || null;
   i.push(a);
-  for (let u = 0; u < n.itemCount_; u++) {
-    const l = s.valueToCode(n, "ADD" + u, r.ATOMIC) || null;
+  for (let r = 0; r < n.itemCount_; r++) {
+    const l = s.valueToCode(n, "ADD" + r, u.ATOMIC) || null;
     i.push(l);
   }
-  return [`{type:${e(o)},entries:[${i}]}`, r.ATOMIC];
+  return [`{type:${e(o)},entries:[${i}]}`, u.ATOMIC];
 };
 function ps(t) {
   const e = t.getInput("TABLE").connection;
@@ -4674,10 +4713,10 @@ const fs = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "HANDLE")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "SUCCESS")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("SelectTable").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "HANDLE")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "SUCCESS")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("SelectTable").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || (ps(this), ds(this), Y(this, [
+    this.isInsertionMarker() || (ps(this), ds(this), F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0]
     ]), hs(this));
@@ -4685,7 +4724,7 @@ const fs = {
 };
 E.delete_data_v1 = fs;
 s.forBlock.delete_data_v1 = function(t) {
-  const e = s.INDENT, n = s.valueToCode(t, "TABLE", r.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", r.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
+  const e = s.INDENT, n = s.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", u.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -4718,7 +4757,7 @@ T([
   }
 ]);
 s.forBlock.interrupt_transaction_v1 = function(t) {
-  return `throw ${s.valueToCode(t, "VALUE", r.NONE) || "''"};
+  return `throw ${s.valueToCode(t, "VALUE", u.NONE) || "''"};
 `;
 };
 function ms(t) {
@@ -4728,22 +4767,22 @@ function ms(t) {
   let n, o;
   const i = nt()?.[0];
   if (i) {
-    const u = H(i.id)?.[0];
-    if (u) {
+    const r = H(i.id)?.[0];
+    if (r) {
       n = {
         space: {
           id: i.id,
           name: i.name
         },
         table: {
-          id: u.id,
-          name: u.name,
-          columns: u.columns
+          id: r.id,
+          name: r.name,
+          columns: r.columns
         },
-        itemCount: u.columns.length
+        itemCount: r.columns.length
       }, o = {};
-      for (let l = 0; l < u.columns.length; l++) {
-        const _ = u.columns[l];
+      for (let l = 0; l < r.columns.length; l++) {
+        const _ = r.columns[l];
         o["COLUMN" + l] = _.id, o["ALIAS" + l] = _.name;
       }
     }
@@ -4852,10 +4891,10 @@ const As = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("EXTRA_DATA") || (this.appendValueInput("EXTRA_DATA"), this.moveInputBefore("EXTRA_DATA", "HANDLE")), this.getInput("MAIN_DATA") || (this.appendValueInput("MAIN_DATA"), this.moveInputBefore("MAIN_DATA", "EXTRA_DATA")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "MAIN_DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("EXTRA") || (this.appendValueInput("EXTRA").setCheck(["QueryExtra", "Array"]).setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_EXTRA}"), this.moveInputBefore("EXTRA", "SUCCESS")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "EXTRA")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck(["SelectColumn", "Array"]).setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("EXTRA_DATA") || (this.appendValueInput("EXTRA_DATA"), this.moveInputBefore("EXTRA_DATA", "HANDLE")), this.getInput("MAIN_DATA") || (this.appendValueInput("MAIN_DATA"), this.moveInputBefore("MAIN_DATA", "EXTRA_DATA")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "MAIN_DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("EXTRA") || (this.appendValueInput("EXTRA").setCheck(["QueryExtra", "Array"]).setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_EXTRA}"), this.moveInputBefore("EXTRA", "SUCCESS")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "EXTRA")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck(["SelectColumn", "Array"]).setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || (ms(this), Ts(this), Es(this), Y(this, [
+    this.isInsertionMarker() || (ms(this), Ts(this), Es(this), F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0],
       ["MAIN_DATA", "__mainData__", "x-runtime-lib.mainData", !0],
@@ -4865,7 +4904,7 @@ const As = {
 };
 E.query_data_v1 = As;
 s.forBlock.query_data_v1 = function(t) {
-  const e = s.INDENT, n = s.valueToCode(t, "TABLE", r.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", r.ATOMIC) || "null", i = s.valueToCode(t, "EXTRA", r.ATOMIC) || "null", a = s.statementToCode(t, "HANDLE");
+  const e = s.INDENT, n = s.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", u.ATOMIC) || "null", i = s.valueToCode(t, "EXTRA", u.ATOMIC) || "null", a = s.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -4906,8 +4945,8 @@ T([
   }
 ]);
 s.forBlock.query_extra_limit_v1 = function(t) {
-  const e = s.valueToCode(t, "OFFSET", r.ATOMIC) || 0, n = s.valueToCode(t, "LIMIT", r.ATOMIC) || 0;
-  return [`{type:'limit',value:${e},value2:${n}}`, r.ATOMIC];
+  const e = s.valueToCode(t, "OFFSET", u.ATOMIC) || 0, n = s.valueToCode(t, "LIMIT", u.ATOMIC) || 0;
+  return [`{type:'limit',value:${e},value2:${n}}`, u.ATOMIC];
 };
 T([
   {
@@ -4933,8 +4972,8 @@ T([
   }
 ]);
 s.forBlock.query_extra_sortby_v1 = function(t) {
-  const e = s.valueToCode(t, "COLUMN", r.ATOMIC) || "''", n = s.valueToCode(t, "DESC", r.ATOMIC) || !1;
-  return [`{type:'sortby',value:${e},value2:${n}}`, r.ATOMIC];
+  const e = s.valueToCode(t, "COLUMN", u.ATOMIC) || "''", n = s.valueToCode(t, "DESC", u.ATOMIC) || !1;
+  return [`{type:'sortby',value:${e},value2:${n}}`, u.ATOMIC];
 };
 const Is = {
   init: function() {
@@ -4948,7 +4987,7 @@ const Os = {
   }
 };
 E.select_column_item_v1 = Os;
-const vs = {
+const ys = {
   init: function() {
     this.space = {
       id: "",
@@ -4964,7 +5003,7 @@ const vs = {
       new O(() => this.genTableOpts_()),
       "TABLE"
     ), this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["select_column_item_v1"],
         this
       )
@@ -5033,19 +5072,19 @@ const vs = {
     }
   },
   onSpaceChange_: function(t) {
-    const e = mt(t);
+    const e = Tt(t);
     if (!e) {
       console.assert(!1);
       return;
     }
     const n = e.id !== this.space.id;
-    if (this.space.id = e.id, this.space.name = e.name, n || !q(this.space.id, this.table.id)) {
+    if (this.space.id = e.id, this.space.name = e.name, n || !z(this.space.id, this.table.id)) {
       const o = H(this.space.id)?.[0]?.id ?? "", i = this.getField("TABLE");
       i.getOptions(!1), i.setValue(o, !1), this.onTableChange_(o);
     }
   },
   onTableChange_: function(t) {
-    const e = q(this.space.id, t);
+    const e = z(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -5120,8 +5159,8 @@ const vs = {
       for (let t = 0; t < this.table.columns.length; t++) {
         const e = this.table.columns[t], n = new O(
           () => this.genColumnOpts_()
-        ), o = new ht("");
-        this.appendDummyInput("ADD" + t).setAlign(y.Align.RIGHT).appendField(n, "COLUMN" + t).appendField("%{BKY_DATA_AS}").appendField(o, "ALIAS" + t), n.setValue(e.id, !1), o.setValue(e.name, !1);
+        ), o = new ft("");
+        this.appendDummyInput("ADD" + t).setAlign(v.Align.RIGHT).appendField(n, "COLUMN" + t).appendField("%{BKY_DATA_AS}").appendField(o, "ALIAS" + t), n.setValue(e.id, !1), o.setValue(e.name, !1);
       }
   },
   updateShape_: function() {
@@ -5132,20 +5171,20 @@ const vs = {
         continue;
       const e = new O(
         () => this.genColumnOpts_()
-      ), n = new ht("");
-      this.appendDummyInput("ADD" + t).setAlign(y.Align.RIGHT).appendField(e, "COLUMN" + t).appendField("%{BKY_DATA_AS}").appendField(n, "ALIAS" + t);
+      ), n = new ft("");
+      this.appendDummyInput("ADD" + t).setAlign(v.Align.RIGHT).appendField(e, "COLUMN" + t).appendField("%{BKY_DATA_AS}").appendField(n, "ALIAS" + t);
       const o = this.table.columns[0];
       e.setValue(o.id ?? "", !1), n.setValue(o.name ?? "", !1);
     }
   },
   checkWarning_: function() {
-    const t = mt(this.space.id);
+    const t = Tt(this.space.id);
     if (!t) {
       this.setWarningText(f("WARN_SPACE_NOT_FOUND"));
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = q(this.space.id, this.table.id);
+    const e = z(this.space.id, this.table.id);
     if (!e) {
       this.setWarningText(f("WARN_TABLE_NOT_FOUND"));
       return;
@@ -5157,7 +5196,7 @@ const vs = {
     this.setWarningText(null);
   }
 };
-E.select_column_v1 = vs;
+E.select_column_v1 = ys;
 s.forBlock.select_column_v1 = function(t) {
   const e = s.quote_, n = t, o = n.space.id, i = n.table.id, a = [];
   for (let l = 0; l < n.itemCount_; l++) {
@@ -5167,9 +5206,9 @@ s.forBlock.select_column_v1 = function(t) {
   let c = "[";
   return a.forEach(({ name: l, alias: _ }, d) => {
     d !== 0 && (c += ","), c += `{name:${e(l)},alias:${e(_)}}`;
-  }), c += "]", [`{spaceId:${e(o)},tableId:${e(i)},columns:${c}}`, r.ATOMIC];
+  }), c += "]", [`{spaceId:${e(o)},tableId:${e(i)},columns:${c}}`, u.ATOMIC];
 };
-const ys = {
+const vs = {
   init: function() {
     this.space = {
       id: "",
@@ -5227,19 +5266,19 @@ const ys = {
     }
   },
   onSpaceChange_: function(t) {
-    const e = mt(t);
+    const e = Tt(t);
     if (!e) {
       console.assert(!1);
       return;
     }
     let n = !1;
-    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("TABLE").getOptions(!1), n || !q(this.space.id, this.table.id)) {
+    if (e.id !== this.space.id && (n = !0), this.space.id = e.id, this.space.name = e.name, this.getField("TABLE").getOptions(!1), n || !z(this.space.id, this.table.id)) {
       const i = H(this.space.id)?.[0];
       i ? this.setFieldValue(i.id, "TABLE") : this.setFieldValue("", "TABLE");
     }
   },
   onTableChange_: function(t) {
-    const e = q(this.space.id, t);
+    const e = z(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -5247,13 +5286,13 @@ const ys = {
     this.table.id = e.id, this.table.name = e.name;
   },
   checkWarning_: function() {
-    const t = mt(this.space.id);
+    const t = Tt(this.space.id);
     if (!t) {
       this.setWarningText(f("WARN_SPACE_NOT_FOUND"));
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = q(this.space.id, this.table.id);
+    const e = z(this.space.id, this.table.id);
     if (!e) {
       this.setWarningText(f("WARN_TABLE_NOT_FOUND"));
       return;
@@ -5261,10 +5300,10 @@ const ys = {
     e.name !== this.table.name && (this.table.name = e.name), this.setWarningText(null);
   }
 };
-E.select_table_v1 = ys;
+E.select_table_v1 = vs;
 s.forBlock.select_table_v1 = function(t) {
   const e = s.quote_, n = t, o = n.space.id, i = n.table.id;
-  return [`{spaceId:${e(o)},tableId:${e(i)}}`, r.ATOMIC];
+  return [`{spaceId:${e(o)},tableId:${e(i)}}`, u.ATOMIC];
 };
 const Cs = {
   init: function() {
@@ -5282,7 +5321,7 @@ const Cs = {
     this.getInput("FINALLY") || this.appendStatementInput("FINALLY").appendField("%{BKY_DATA_FINALLY}"), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "FINALLY")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("HANDLE") || (this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.moveInputBefore("HANDLE", "SUCCESS"));
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || Y(this, [
+    this.isInsertionMarker() || F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0]
     ]);
@@ -5360,7 +5399,7 @@ const Ls = {
       new O(() => this.genTableOpts_()),
       "TABLE"
     ), this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["update_column_item_v1"],
         this
       )
@@ -5429,19 +5468,19 @@ const Ls = {
     }
   },
   onSpaceChange_: function(t) {
-    const e = mt(t);
+    const e = Tt(t);
     if (!e) {
       console.assert(!1);
       return;
     }
     const n = e.id !== this.space.id;
-    if (this.space.id = e.id, this.space.name = e.name, n || !q(this.space.id, this.table.id)) {
+    if (this.space.id = e.id, this.space.name = e.name, n || !z(this.space.id, this.table.id)) {
       const o = H(this.space.id)?.[0]?.id ?? "", i = this.getField("TABLE");
       i.getOptions(!1), i.setValue(o, !1), this.onTableChange_(o);
     }
   },
   onTableChange_: function(t) {
-    const e = q(this.space.id, t);
+    const e = z(this.space.id, t);
     if (!e) {
       console.assert(!1);
       return;
@@ -5527,7 +5566,7 @@ const Ls = {
         const e = this.table.columns[t], n = new O(
           () => this.genColumnOpts_()
         );
-        this.appendValueInput("ADD" + t).setAlign(y.Align.RIGHT).appendField(n, "COLUMN" + t), n.setValue(e.id, !1);
+        this.appendValueInput("ADD" + t).setAlign(v.Align.RIGHT).appendField(n, "COLUMN" + t), n.setValue(e.id, !1);
       }
   },
   updateShape_: function() {
@@ -5541,7 +5580,7 @@ const Ls = {
       const e = new O(
         () => this.genColumnOpts_()
       );
-      this.appendValueInput("ADD" + t).setAlign(y.Align.RIGHT).appendField(e, "COLUMN" + t);
+      this.appendValueInput("ADD" + t).setAlign(v.Align.RIGHT).appendField(e, "COLUMN" + t);
     }
   },
   updateBlocks_: function(t) {
@@ -5556,8 +5595,8 @@ const Ls = {
         if (!c)
           continue;
         n.setCheck(null);
-        const u = Je(this.workspace, c.type);
-        u && o.connect(u.outputConnection);
+        const r = Je(this.workspace, c.type);
+        r && o.connect(r.outputConnection);
       }
   },
   updateCheck_: function() {
@@ -5570,13 +5609,13 @@ const Ls = {
     }
   },
   checkWarning_: function() {
-    const t = mt(this.space.id);
+    const t = Tt(this.space.id);
     if (!t) {
       this.setWarningText(f("WARN_SPACE_NOT_FOUND"));
       return;
     }
     t.name !== this.space.name && (this.space.name = t.name);
-    const e = q(this.space.id, this.table.id);
+    const e = z(this.space.id, this.table.id);
     if (!e) {
       this.setWarningText(f("WARN_TABLE_NOT_FOUND"));
       return;
@@ -5592,13 +5631,13 @@ E.update_column_v1 = Ls;
 s.forBlock.update_column_v1 = function(t) {
   const e = s.quote_, n = t, o = n.space.id, i = n.table.id, a = [];
   for (let l = 0; l < n.itemCount_; l++) {
-    const _ = n.getFieldValue("COLUMN" + l), d = n.table.columns.find((p) => p.id === _).name, h = s.valueToCode(n, "ADD" + l, r.ATOMIC) || "null";
+    const _ = n.getFieldValue("COLUMN" + l), d = n.table.columns.find((p) => p.id === _).name, h = s.valueToCode(n, "ADD" + l, u.ATOMIC) || "null";
     a.push({ name: d, value: h });
   }
   let c = "[";
   return a.forEach(({ name: l, value: _ }, d) => {
     d !== 0 && (c += ","), c += `{name:${e(l)},value:${_}}`;
-  }), c += "]", [`{spaceId:${e(o)},tableId:${e(i)},columns:${c}}`, r.ATOMIC];
+  }), c += "]", [`{spaceId:${e(o)},tableId:${e(i)},columns:${c}}`, u.ATOMIC];
 };
 function Ss(t) {
   const e = t.getInput("TABLE").connection;
@@ -5607,22 +5646,22 @@ function Ss(t) {
   let n, o;
   const i = nt()?.[0];
   if (i) {
-    const u = H(i.id)?.[0];
-    if (u) {
+    const r = H(i.id)?.[0];
+    if (r) {
       n = {
         space: {
           id: i.id,
           name: i.name
         },
         table: {
-          id: u.id,
-          name: u.name,
-          columns: u.columns
+          id: r.id,
+          name: r.name,
+          columns: r.columns
         },
-        itemCount: u.columns.length
+        itemCount: r.columns.length
       }, o = {};
-      for (let l = 0; l < u.columns.length; l++) {
-        const _ = u.columns[l];
+      for (let l = 0; l < r.columns.length; l++) {
+        const _ = r.columns[l];
         o["COLUMN" + l] = _.id;
       }
     }
@@ -5680,10 +5719,10 @@ const Ps = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "SUCCESS")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("UpdateColumn").setAlign(y.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_DATA_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_DATA_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("CONDITION") || (this.appendValueInput("CONDITION").setCheck("Condition").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_CONDITION}"), this.moveInputBefore("CONDITION", "SUCCESS")), this.getInput("TABLE") || (this.appendValueInput("TABLE").setCheck("UpdateColumn").setAlign(v.Align.RIGHT).appendField("%{BKY_DATA_TABLE}"), this.moveInputBefore("TABLE", "CONDITION"));
   },
   ensureBlocks: function() {
-    this.isInsertionMarker() || (Ss(this), Bs(this), Y(this, [
+    this.isInsertionMarker() || (Ss(this), Bs(this), F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0],
       ["DATA", "__data__", "x-runtime-lib.data", !0]
@@ -5692,7 +5731,7 @@ const Ps = {
 };
 E.update_data_v1 = Ps;
 s.forBlock.update_data_v1 = function(t) {
-  const e = s.INDENT, n = s.valueToCode(t, "TABLE", r.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", r.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
+  const e = s.INDENT, n = s.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = s.valueToCode(t, "CONDITION", u.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -5709,8 +5748,8 @@ ${i}}
 };
 const Rs = C.xml, Ds = {
   init: function() {
-    this.length = 0, this.appendDummyInput("OPEN_BRACKET").appendField(" [ "), this.appendDummyInput("ADD").setAlign(y.Align.CENTRE).appendField(
-      new ot(St, 20, 20, void 0, () => {
+    this.length = 0, this.appendDummyInput("OPEN_BRACKET").appendField(" [ "), this.appendDummyInput("ADD").setAlign(v.Align.CENTRE).appendField(
+      new ot(bt, 20, 20, void 0, () => {
         this.isInFlyout || this.addEntry_();
       })
     ), this.appendDummyInput("CLOSE_BRACKET").appendField(" ] "), this.setInputsInline(!1), this.setOutput(!0, "JsonArray"), this.setColour(350), this.setTooltip(""), this.setHelpUrl("");
@@ -5720,7 +5759,7 @@ const Rs = C.xml, Ds = {
     return t.setAttribute("items", String(this.length)), t;
   },
   domToMutation: function(t) {
-    this.length = Yt(t.getAttribute("items") ?? "", 0), this.initShape_();
+    this.length = Ft(t.getAttribute("items") ?? "", 0), this.initShape_();
   },
   initData: function(t) {
     this.length = t, this.initShape_();
@@ -5729,7 +5768,7 @@ const Rs = C.xml, Ds = {
     for (let t = 0; t < this.length; t++) {
       const e = "ENTRY" + t, n = this.appendValueInput(e);
       n.appendField(
-        new ot(St, 20, 20, void 0, () => {
+        new ot(bt, 20, 20, void 0, () => {
           this.isInFlyout || this.addEntry_(n);
         })
       ), n.appendField(new En(String(t))), n.appendField(
@@ -5741,14 +5780,14 @@ const Rs = C.xml, Ds = {
   },
   addEntry_: function(t) {
     let e = this.length;
-    t && (e = Yt(t.name.substring(5)));
+    t && (e = Ft(t.name.substring(5)));
     for (let o = this.length - 1; o >= e; o--) {
       const i = this.getInput("ENTRY" + o);
       i.name = "ENTRY" + (o + 1), i.fieldRow[1].setValue(o + 1);
     }
     const n = this.appendValueInput("ENTRY" + e);
     n.appendField(
-      new ot(St, 20, 20, void 0, () => {
+      new ot(bt, 20, 20, void 0, () => {
         this.isInFlyout || this.addEntry_(n);
       })
     ), n.appendField(new En(String(e))), n.appendField(
@@ -5760,7 +5799,7 @@ const Rs = C.xml, Ds = {
   removeEntry_: function(t) {
     const e = t.name, n = this.getInputTargetBlock(e);
     n && n.dispose(), this.removeInput(e);
-    const o = Yt(e.substring(5));
+    const o = Ft(e.substring(5));
     for (let i = o + 1; i < this.length; i++) {
       const a = this.getInput("ENTRY" + i);
       a.name = "ENTRY" + (i - 1), a.fieldRow[1].setValue(i - 1);
@@ -5783,8 +5822,8 @@ const Ms = {
 E.json_boolean_v1 = Ms;
 const Ln = C.xml, Us = {
   init: function() {
-    this.length = 0, this.appendDummyInput("OPEN_BRACKET").appendField(" { "), this.appendDummyInput("ADD").setAlign(y.Align.CENTRE).appendField(
-      new ot(St, 20, 20, void 0, () => {
+    this.length = 0, this.appendDummyInput("OPEN_BRACKET").appendField(" { "), this.appendDummyInput("ADD").setAlign(v.Align.CENTRE).appendField(
+      new ot(bt, 20, 20, void 0, () => {
         this.isInFlyout || this.addEntry_();
       })
     ), this.appendDummyInput("CLOSE_BRACHET").appendField(" } "), this.setInputsInline(!1), this.setOutput(!0, "JsonMap"), this.setColour(120), this.setTooltip(""), this.setHelpUrl("");
@@ -5812,10 +5851,10 @@ const Ln = C.xml, Us = {
     for (let e = 0; e < t.length; e++) {
       const n = t[e], o = "ENTRY" + e, i = this.appendValueInput(o);
       i.appendField(
-        new ot(St, 20, 20, void 0, () => {
+        new ot(bt, 20, 20, void 0, () => {
           this.isInFlyout || this.addEntry_(i);
         })
-      ), i.appendField(new ht(n), "KEY" + e), i.appendField(
+      ), i.appendField(new ft(n), "KEY" + e), i.appendField(
         new ot(se, 20, 20, void 0, () => {
           this.isInFlyout || this.removeEntry_(i);
         })
@@ -5824,15 +5863,15 @@ const Ln = C.xml, Us = {
   },
   addEntry_: function(t) {
     let e = this.length;
-    t && (e = Yt(t.name.substring(5)));
+    t && (e = Ft(t.name.substring(5)));
     for (let o = this.length - 1; o >= e; o--)
       this.getField("KEY" + o).name = "KEY" + (o + 1), this.getInput("ENTRY" + o).name = "ENTRY" + (o + 1);
     const n = this.appendValueInput("ENTRY" + e);
     n.appendField(
-      new ot(St, 20, 20, void 0, () => {
+      new ot(bt, 20, 20, void 0, () => {
         this.isInFlyout || this.addEntry_(n);
       })
-    ), n.appendField(new ht("key"), "KEY" + e), n.appendField(
+    ), n.appendField(new ft("key"), "KEY" + e), n.appendField(
       new ot(se, 20, 20, void 0, () => {
         this.isInFlyout || this.removeEntry_(n);
       })
@@ -5841,7 +5880,7 @@ const Ln = C.xml, Us = {
   removeEntry_: function(t) {
     const e = t.name, n = this.getInputTargetBlock(e);
     n && n.dispose(), this.removeInput(e);
-    const o = Yt(e.substring(5));
+    const o = Ft(e.substring(5));
     for (let i = o + 1; i < this.length; i++)
       this.getField("KEY" + i).name = "KEY" + (i - 1), this.getInput("ENTRY" + i).name = "ENTRY" + (i - 1);
     this.length--;
@@ -5856,13 +5895,13 @@ const Vs = {
 E.json_number_v1 = Vs;
 const xs = {
   init: function() {
-    this.appendDummyInput().setAlign(y.Align.CENTRE).appendField("JSON"), this.appendValueInput("JSON").setCheck(["JsonMap", "JsonArray"]), this.setDeletable(!1), this.setColour(250), this.setTooltip(""), this.setHelpUrl("");
+    this.appendDummyInput().setAlign(v.Align.CENTRE).appendField("JSON"), this.appendValueInput("JSON").setCheck(["JsonMap", "JsonArray"]), this.setDeletable(!1), this.setColour(250), this.setTooltip(""), this.setHelpUrl("");
   }
 };
 E.json_root_v1 = xs;
 const Ys = {
   init: function() {
-    this.appendDummyInput().appendField('"').appendField(new ht(""), "VALUE").appendField('"'), this.setOutput(!0, "JsonString"), this.setColour(160);
+    this.appendDummyInput().appendField('"').appendField(new ft(""), "VALUE").appendField('"'), this.setOutput(!0, "JsonString"), this.setColour(160);
   }
 };
 E.json_string_v1 = Ys;
@@ -5881,7 +5920,7 @@ E.list_create_item_v1 = Ks;
 const $s = {
   init: function() {
     this.itemCount_ = 0, this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["list_create_item_v1"],
         this
       )
@@ -5955,7 +5994,7 @@ const $s = {
         "Boolean",
         "Array",
         "Object"
-      ]), t === 0 && this.getInput("ADD" + t).setAlign(y.Align.RIGHT).appendField("%{BKY_LIST_V1_CREATE_TITLE}"));
+      ]), t === 0 && this.getInput("ADD" + t).setAlign(v.Align.RIGHT).appendField("%{BKY_LIST_V1_CREATE_TITLE}"));
     for (let t = this.itemCount_; this.getInput("ADD" + t); t++)
       this.removeInput("ADD" + t);
   }
@@ -5964,8 +6003,8 @@ E.list_create_v1 = $s;
 s.forBlock.list_create_v1 = function(t) {
   const e = t, n = new Array(e.itemCount_);
   for (let i = 0; i < e.itemCount_; i++)
-    n[i] = s.valueToCode(e, "ADD" + i, r.NONE) || "null";
-  return ["[" + n.join(", ") + "]", r.ATOMIC];
+    n[i] = s.valueToCode(e, "ADD" + i, u.NONE) || "null";
+  return ["[" + n.join(", ") + "]", u.ATOMIC];
 };
 T([
   {
@@ -5992,7 +6031,7 @@ T([
   }
 ]);
 s.forBlock.list_delete_v1 = function(t) {
-  const e = s.valueToCode(t, "VALUE", r.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
+  const e = s.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
   return `${e}.splice(${n}, 1)`;
 };
 T([
@@ -6019,8 +6058,8 @@ T([
   }
 ]);
 s.forBlock.list_get_v1 = function(t) {
-  const e = s.valueToCode(t, "VALUE", r.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
-  return [`${e}[${n}]`, r.MEMBER];
+  const e = s.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
+  return [`${e}[${n}]`, u.MEMBER];
 };
 T([
   {
@@ -6051,8 +6090,8 @@ T([
   }
 ]);
 s.forBlock.list_get_sublist_v1 = function(t) {
-  const e = s.valueToCode(t, "LIST", r.MEMBER) || "[]", n = s.getAdjusted(t, "START"), o = s.getAdjusted(t, "END", 1);
-  return [`${e}.slice(${n}, ${o})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "LIST", u.MEMBER) || "[]", n = s.getAdjusted(t, "START"), o = s.getAdjusted(t, "END", 1);
+  return [`${e}.slice(${n}, ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -6072,7 +6111,7 @@ T([
   }
 ]);
 s.forBlock.list_is_empty_v1 = function(t) {
-  return [`!${s.valueToCode(t, "VALUE", r.MEMBER) || "[]"}.length`, r.LOGICAL_NOT];
+  return [`!${s.valueToCode(t, "VALUE", u.MEMBER) || "[]"}.length`, u.LOGICAL_NOT];
 };
 T([
   {
@@ -6098,8 +6137,8 @@ T([
   }
 ]);
 s.forBlock.list_join_v1 = function(t) {
-  const e = s.valueToCode(t, "LIST", r.MEMBER) || "[]", n = s.valueToCode(t, "DELIM", r.NONE) || "''";
-  return [`${e}.join(${n})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "LIST", u.MEMBER) || "[]", n = s.valueToCode(t, "DELIM", u.NONE) || "''";
+  return [`${e}.join(${n})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -6119,7 +6158,7 @@ T([
   }
 ]);
 s.forBlock.list_length_v1 = function(t) {
-  return [`${s.valueToCode(t, "VALUE", r.MEMBER) || "[]"}.length`, r.MEMBER];
+  return [`${s.valueToCode(t, "VALUE", u.MEMBER) || "[]"}.length`, u.MEMBER];
 };
 T([
   {
@@ -6140,7 +6179,7 @@ T([
   }
 ]);
 s.forBlock.list_reverse_v1 = function(t) {
-  return [`${s.valueToCode(t, "LIST", r.NONE) || "[]"}.slice().reverse()`, r.FUNCTION_CALL];
+  return [`${s.valueToCode(t, "LIST", u.NONE) || "[]"}.slice().reverse()`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -6172,7 +6211,7 @@ T([
   }
 ]);
 s.forBlock.list_set_v1 = function(t) {
-  const e = s.valueToCode(t, "LIST", r.MEMBER) || "[]", n = s.getAdjusted(t, "AT"), o = s.valueToCode(t, "VALUE", r.ASSIGNMENT) || "null";
+  const e = s.valueToCode(t, "LIST", u.MEMBER) || "[]", n = s.getAdjusted(t, "AT"), o = s.valueToCode(t, "VALUE", u.ASSIGNMENT) || "null";
   return `${e}[${n}] = ${o};
 `;
 };
@@ -6213,7 +6252,7 @@ T([
   }
 ]);
 s.forBlock.logic_boolean_v1 = function(t) {
-  return [t.getFieldValue("BOOL") === "TRUE" ? "true" : "false", r.ATOMIC];
+  return [t.getFieldValue("BOOL") === "TRUE" ? "true" : "false", u.ATOMIC];
 };
 const Gs = {
   onchange: function(t) {
@@ -6280,8 +6319,8 @@ s.forBlock.logic_compare_v1 = function(t) {
     GT: ">",
     GTE: ">="
   }[t.getFieldValue("OP")];
-  let o = r.RELATIONAL;
-  (n === "==" || n === "!=") && (o = r.EQUALITY);
+  let o = u.RELATIONAL;
+  (n === "==" || n === "!=") && (o = u.EQUALITY);
   const i = s.valueToCode(t, "A", o) || "0", a = s.valueToCode(t, "B", o) || "0";
   return [`${i} ${n} ${a}`, o];
 };
@@ -6471,7 +6510,7 @@ s.forBlock.logic_if_v1 = function(t) {
     t
   ));
   do {
-    const o = s.valueToCode(t, "IF" + e, r.NONE) || "false";
+    const o = s.valueToCode(t, "IF" + e, u.NONE) || "false";
     let i = s.statementToCode(t, "DO" + e);
     s.STATEMENT_SUFFIX && (i = s.prefixLines(
       s.injectId(
@@ -6514,7 +6553,7 @@ T([
   }
 ]);
 s.forBlock.logic_negate_v1 = function(t) {
-  return [`!${s.valueToCode(t, "BOOL", r.LOGICAL_NOT) || "true"}`, r.LOGICAL_NOT];
+  return [`!${s.valueToCode(t, "BOOL", u.LOGICAL_NOT) || "true"}`, u.LOGICAL_NOT];
 };
 T([
   {
@@ -6548,7 +6587,7 @@ T([
   }
 ]);
 s.forBlock.logic_operation_v1 = function(t) {
-  const e = t.getFieldValue("OP") === "AND" ? "&&" : "||", n = e === "&&" ? r.LOGICAL_AND : r.LOGICAL_OR;
+  const e = t.getFieldValue("OP") === "AND" ? "&&" : "||", n = e === "&&" ? u.LOGICAL_AND : u.LOGICAL_OR;
   let o = s.valueToCode(t, "A", n), i = s.valueToCode(t, "B", n);
   if (!o && !i)
     o = "false", i = "false";
@@ -6607,8 +6646,8 @@ T([
   }
 ]);
 s.forBlock.logic_ternary_v1 = function(t) {
-  const e = s.valueToCode(t, "IF", r.CONDITIONAL) || "false", n = s.valueToCode(t, "THEN", r.CONDITIONAL) || "null", o = s.valueToCode(t, "ELSE", r.CONDITIONAL) || "null";
-  return [e + " ? " + n + " : " + o, r.CONDITIONAL];
+  const e = s.valueToCode(t, "IF", u.CONDITIONAL) || "false", n = s.valueToCode(t, "THEN", u.CONDITIONAL) || "null", o = s.valueToCode(t, "ELSE", u.CONDITIONAL) || "null";
+  return [e + " ? " + n + " : " + o, u.CONDITIONAL];
 };
 const Xs = {
   customContextMenu: function(t) {
@@ -6774,42 +6813,42 @@ T([
 s.forBlock.for_v1 = function(t) {
   const e = s.INDENT, n = s.getVariableName(
     t.getFieldValue("VAR")
-  ), o = s.valueToCode(t, "FROM", r.ASSIGNMENT) || "0", i = s.valueToCode(t, "TO", r.ASSIGNMENT) || "0", a = s.valueToCode(t, "BY", r.ASSIGNMENT) || "1", c = s.addLoopTrap(
+  ), o = s.valueToCode(t, "FROM", u.ASSIGNMENT) || "0", i = s.valueToCode(t, "TO", u.ASSIGNMENT) || "0", a = s.valueToCode(t, "BY", u.ASSIGNMENT) || "1", c = s.addLoopTrap(
     s.statementToCode(t, "DO"),
     t
   );
   if (C.string.isNumber(o) && C.string.isNumber(i) && C.string.isNumber(a)) {
-    const u = Math.abs(Number(a));
-    return Number(o) <= Number(i) ? `for (${n} = ${o}; ${n} <= ${i}; ${n} += ${u}) {
+    const r = Math.abs(Number(a));
+    return Number(o) <= Number(i) ? `for (${n} = ${o}; ${n} <= ${i}; ${n} += ${r}) {
 ${c}}
-` : `for (${n} = ${o}; ${n} >= ${i}; ${n} -= ${u}) {
+` : `for (${n} = ${o}; ${n} >= ${i}; ${n} -= ${r}) {
 ${c}}
 `;
   } else {
-    let u = "", l = o;
+    let r = "", l = o;
     !o.match(/^\w+$/) && !C.string.isNumber(o) && (l = s.nameDB_.getDistinctName(
       `${n}_from`,
       it.NameType.VARIABLE
-    ), u += `var ${l} = ${o};
+    ), r += `var ${l} = ${o};
 `);
     let _ = i;
     !i.match(/^\w+$/) && !C.string.isNumber(i) && (_ = s.nameDB_.getDistinctName(
       `${n}_to`,
       it.NameType.VARIABLE
-    ), u += `var ${_} = ${i};
+    ), r += `var ${_} = ${i};
 `);
     const d = s.nameDB_.getDistinctName(
       `${n}_by`,
       it.NameType.VARIABLE
     );
-    return u += `var ${d} = `, C.string.isNumber(a) ? u += `${Math.abs(Number(a))};
-` : u += `Math.abs(${a});
-`, u += `if (${l} > ${_}) {
+    return r += `var ${d} = `, C.string.isNumber(a) ? r += `${Math.abs(Number(a))};
+` : r += `Math.abs(${a});
+`, r += `if (${l} > ${_}) {
 ${e}${d} = -${d};
 }
-`, u += `for (${n} = ${l}; ${d} >= 0 ? ${n} <= ${_} : ${n} >= ${_}; ${n} += ${d}) {
+`, r += `for (${n} = ${l}; ${d} >= 0 ? ${n} <= ${_} : ${n} >= ${_}; ${n} += ${d}) {
 ${c}}
-`, u;
+`, r;
   }
 };
 B.register(
@@ -6852,7 +6891,7 @@ T([
 s.forBlock.for_each_v1 = function(t) {
   const e = s.INDENT, n = s.getVariableName(
     t.getFieldValue("VAR")
-  ), o = s.valueToCode(t, "LIST", r.ASSIGNMENT) || "[]", i = s.addLoopTrap(
+  ), o = s.valueToCode(t, "LIST", u.ASSIGNMENT) || "[]", i = s.addLoopTrap(
     s.statementToCode(t, "DO"),
     t
   );
@@ -6862,12 +6901,12 @@ s.forBlock.for_each_v1 = function(t) {
     it.NameType.VARIABLE
   ), a += `var ${c} = ${o};
 `);
-  const u = s.nameDB_.getDistinctName(
+  const r = s.nameDB_.getDistinctName(
     `${n}_index`,
     it.NameType.VARIABLE
   );
-  return a += `for (var ${u} in ${c}) {
-${e}${n} = ${c}[${u}];
+  return a += `for (var ${r} in ${c}) {
+${e}${n} = ${c}[${r}];
 ${i}}
 `, a;
 };
@@ -6898,7 +6937,7 @@ T([
 ]);
 s.forBlock.repeat_v1 = function(t) {
   let e = "";
-  t.getField("TIMES") ? e = String(Number(t.getFieldValue("TIMES"))) : e = s.valueToCode(t, "TIMES", r.ASSIGNMENT) || "0";
+  t.getField("TIMES") ? e = String(Number(t.getFieldValue("TIMES"))) : e = s.valueToCode(t, "TIMES", u.ASSIGNMENT) || "0";
   const n = s.addLoopTrap(
     s.statementToCode(t, "DO"),
     t
@@ -6962,7 +7001,7 @@ s.forBlock.while_until_v1 = function(t) {
   let n = s.valueToCode(
     t,
     "CONDITION",
-    e === "UNTIL" ? r.LOGICAL_NOT : r.NONE
+    e === "UNTIL" ? u.LOGICAL_NOT : u.NONE
   ) || "false";
   e === "UNTIL" && (n = "!" + n);
   const o = s.addLoopTrap(
@@ -7045,13 +7084,13 @@ T([
 ]);
 s.forBlock.math_arithmetic_v1 = function(t) {
   const e = {
-    ADD: [" + ", r.ADDITION],
-    SUBTRACT: [" - ", r.SUBTRACTION],
-    MULTIPLY: [" * ", r.MULTIPLICATION],
-    DIVIDE: [" / ", r.DIVISION],
-    POWER: [null, r.NONE]
+    ADD: [" + ", u.ADDITION],
+    SUBTRACT: [" - ", u.SUBTRACTION],
+    MULTIPLY: [" * ", u.MULTIPLICATION],
+    DIVIDE: [" / ", u.DIVISION],
+    POWER: [null, u.NONE]
   }, [n, o] = e[t.getFieldValue("OP")], i = s.valueToCode(t, "A", o) || "0", a = s.valueToCode(t, "B", o) || "0";
-  return n ? [i + n + a, o] : [`Math.pow(${i}, ${a})`, r.FUNCTION_CALL];
+  return n ? [i + n + a, o] : [`Math.pow(${i}, ${a})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7079,12 +7118,12 @@ T([
 ]);
 s.forBlock.math_constant_v1 = function(t) {
   return {
-    PI: ["Math.PI", r.MEMBER],
-    E: ["Math.E", r.MEMBER],
-    GOLDEN_RATIO: ["(1 + Math.sqrt(5)) / 2", r.DIVISION],
-    SQRT2: ["Math.SQRT2", r.MEMBER],
-    SQRT1_2: ["Math.SQRT1_2", r.MEMBER],
-    INFINITY: ["Infinity", r.ATOMIC]
+    PI: ["Math.PI", u.MEMBER],
+    E: ["Math.E", u.MEMBER],
+    GOLDEN_RATIO: ["(1 + Math.sqrt(5)) / 2", u.DIVISION],
+    SQRT2: ["Math.SQRT2", u.MEMBER],
+    SQRT1_2: ["Math.SQRT1_2", u.MEMBER],
+    INFINITY: ["Infinity", u.ATOMIC]
   }[t.getFieldValue("CONSTANT")];
 };
 T([
@@ -7116,8 +7155,8 @@ T([
   }
 ]);
 s.forBlock.math_constrain_v1 = function(t) {
-  const e = s.valueToCode(t, "VALUE", r.NONE) || "0", n = s.valueToCode(t, "LOW", r.NONE) || "0", o = s.valueToCode(t, "HIGH", r.NONE) || "Infinity";
-  return [`Math.min(Math.max(${e}, ${n}), ${o})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "VALUE", u.NONE) || "0", n = s.valueToCode(t, "LOW", u.NONE) || "0", o = s.valueToCode(t, "HIGH", u.NONE) || "Infinity";
+  return [`Math.min(Math.max(${e}, ${n}), ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7143,8 +7182,8 @@ T([
   }
 ]);
 s.forBlock.math_modulo_v1 = function(t) {
-  const e = s.valueToCode(t, "DIVIDEND", r.MODULUS) || "0", n = s.valueToCode(t, "DIVISOR", r.MODULUS) || "0";
-  return [e + " % " + n, r.MODULUS];
+  const e = s.valueToCode(t, "DIVIDEND", u.MODULUS) || "0", n = s.valueToCode(t, "DIVISOR", u.MODULUS) || "0";
+  return [e + " % " + n, u.MODULUS];
 };
 T([
   {
@@ -7165,7 +7204,7 @@ T([
   }
 ]);
 s.forBlock.math_number_v1 = function(t) {
-  const e = Number(t.getFieldValue("NUM")), n = e >= 0 ? r.ATOMIC : r.UNARY_NEGATION;
+  const e = Number(t.getFieldValue("NUM")), n = e >= 0 ? u.ATOMIC : u.UNARY_NEGATION;
   return [String(e), n];
 };
 T([
@@ -7200,17 +7239,17 @@ T([
 ]);
 s.forBlock.math_number_property_v1 = function(t) {
   const e = {
-    EVEN: [" % 2 === 0", r.MODULUS, r.EQUALITY],
-    ODD: [" % 2 === 1", r.MODULUS, r.EQUALITY],
-    WHOLE: [" % 1 === 0", r.MODULUS, r.EQUALITY],
-    POSITIVE: [" > 0", r.RELATIONAL, r.RELATIONAL],
-    NEGATIVE: [" < 0", r.RELATIONAL, r.RELATIONAL],
-    DIVISIBLE_BY: [null, r.MODULUS, r.EQUALITY],
-    PRIME: [null, r.NONE, r.FUNCTION_CALL]
+    EVEN: [" % 2 === 0", u.MODULUS, u.EQUALITY],
+    ODD: [" % 2 === 1", u.MODULUS, u.EQUALITY],
+    WHOLE: [" % 1 === 0", u.MODULUS, u.EQUALITY],
+    POSITIVE: [" > 0", u.RELATIONAL, u.RELATIONAL],
+    NEGATIVE: [" < 0", u.RELATIONAL, u.RELATIONAL],
+    DIVISIBLE_BY: [null, u.MODULUS, u.EQUALITY],
+    PRIME: [null, u.NONE, u.FUNCTION_CALL]
   }, n = t.getFieldValue("PROPERTY"), [o, i, a] = e[t.getFieldValue("PROPERTY")], c = s.valueToCode(t, "NUMBER_TO_CHECK", i) || "0";
-  let u;
+  let r;
   if (n === "PRIME")
-    u = s.provideFunction_(
+    r = s.provideFunction_(
       "mathIsPrime",
       `
 function ${s.FUNCTION_NAME_PLACEHOLDER_}(n) {
@@ -7234,11 +7273,11 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(n) {
 `
     ) + "(" + c + ")";
   else if (n === "DIVISIBLE_BY") {
-    const l = s.valueToCode(t, "DIVISOR", r.MODULUS) || "0";
-    u = c + " % " + l + " === 0";
+    const l = s.valueToCode(t, "DIVISOR", u.MODULUS) || "0";
+    r = c + " % " + l + " === 0";
   } else
-    u = c + o;
-  return [u, a];
+    r = c + o;
+  return [r, a];
 };
 T([
   {
@@ -7276,13 +7315,13 @@ s.forBlock.math_on_list_v1 = function(t) {
   let n, o;
   switch (e) {
     case "SUM":
-      n = s.valueToCode(t, "LIST", r.MEMBER) || "[]", o = n + ".reduce(function(x, y) {return x + y;}, 0)";
+      n = s.valueToCode(t, "LIST", u.MEMBER) || "[]", o = n + ".reduce(function(x, y) {return x + y;}, 0)";
       break;
     case "MIN":
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = "Math.min.apply(null, " + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = "Math.min.apply(null, " + n + ")";
       break;
     case "MAX":
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = "Math.max.apply(null, " + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = "Math.max.apply(null, " + n + ")";
       break;
     case "AVERAGE": {
       const i = s.provideFunction_(
@@ -7293,7 +7332,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(myList) {
 }
 `
       );
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = i + "(" + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = i + "(" + n + ")";
       break;
     }
     case "MEDIAN": {
@@ -7312,7 +7351,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(myList) {
 }
 `
       );
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = i + "(" + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = i + "(" + n + ")";
       break;
     }
     case "MODE": {
@@ -7349,7 +7388,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(values) {
 }
 `
       );
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = i + "(" + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = i + "(" + n + ")";
       break;
     }
     case "STD_DEV": {
@@ -7369,7 +7408,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(numbers) {
 }
 `
       );
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = i + "(" + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = i + "(" + n + ")";
       break;
     }
     case "RANDOM": {
@@ -7382,13 +7421,13 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(list) {
 }
 `
       );
-      n = s.valueToCode(t, "LIST", r.NONE) || "[]", o = i + "(" + n + ")";
+      n = s.valueToCode(t, "LIST", u.NONE) || "[]", o = i + "(" + n + ")";
       break;
     }
     default:
       throw Error("Unknown operator: " + e);
   }
-  return [o, r.FUNCTION_CALL];
+  return [o, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7401,7 +7440,7 @@ T([
   }
 ]);
 s.forBlock.math_random_float_v1 = function() {
-  return ["Math.random()", r.FUNCTION_CALL];
+  return ["Math.random()", u.FUNCTION_CALL];
 };
 T([
   {
@@ -7427,7 +7466,7 @@ T([
   }
 ]);
 s.forBlock.math_random_int_v1 = function(t) {
-  const e = s.valueToCode(t, "FROM", r.NONE) || "0", n = s.valueToCode(t, "TO", r.NONE) || "0";
+  const e = s.valueToCode(t, "FROM", u.NONE) || "0", n = s.valueToCode(t, "TO", u.NONE) || "0";
   return [s.provideFunction_(
     "mathRandomInt",
     `
@@ -7441,7 +7480,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(a, b) {
   return Math.floor(Math.random() * (b - a + 1) + a);
 }
 `
-  ) + "(" + e + ", " + n + ")", r.FUNCTION_CALL];
+  ) + "(" + e + ", " + n + ")", u.FUNCTION_CALL];
 };
 T([
   {
@@ -7470,7 +7509,7 @@ T([
   }
 ]);
 s.forBlock.math_round_v1 = function(t) {
-  const e = t.getFieldValue("OP"), n = s.valueToCode(t, "NUM", r.NONE) || "0";
+  const e = t.getFieldValue("OP"), n = s.valueToCode(t, "NUM", u.NONE) || "0";
   let o = "";
   switch (e) {
     case "ROUND":
@@ -7483,7 +7522,7 @@ s.forBlock.math_round_v1 = function(t) {
       o = `Math.floor(${n})`;
       break;
   }
-  return [o, r.FUNCTION_CALL];
+  return [o, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7519,8 +7558,8 @@ s.forBlock.math_single_v1 = function(t) {
   const e = t.getFieldValue("OP");
   let n, o;
   if (e === "NEG")
-    return o = s.valueToCode(t, "NUM", r.UNARY_NEGATION) || "0", o[0] === "-" && (o = " " + o), n = "-" + o, [n, r.UNARY_NEGATION];
-  switch (o = s.valueToCode(t, "NUM", r.NONE) || "0", e) {
+    return o = s.valueToCode(t, "NUM", u.UNARY_NEGATION) || "0", o[0] === "-" && (o = " " + o), n = "-" + o, [n, u.UNARY_NEGATION];
+  switch (o = s.valueToCode(t, "NUM", u.NONE) || "0", e) {
     case "ROOT":
       n = `Math.sqrt(${o})`;
       break;
@@ -7538,7 +7577,7 @@ s.forBlock.math_single_v1 = function(t) {
       break;
   }
   if (n)
-    return [n, r.FUNCTION_CALL];
+    return [n, u.FUNCTION_CALL];
   switch (e) {
     case "LOG10":
       n = `Math.log(${o}) / Math.log(10)`;
@@ -7546,7 +7585,7 @@ s.forBlock.math_single_v1 = function(t) {
     default:
       throw Error("Unknown math operator: " + e);
   }
-  return [n, r.DIVISION];
+  return [n, u.DIVISION];
 };
 T([
   {
@@ -7580,7 +7619,7 @@ T([
 s.forBlock.math_trig_v1 = function(t) {
   let e;
   const n = t.getFieldValue("OP");
-  n === "SIN" || n === "COS" || n === "TAN" ? e = s.valueToCode(t, "NUM", r.DIVISION) || "0" : e = s.valueToCode(t, "NUM", r.NONE) || "0";
+  n === "SIN" || n === "COS" || n === "TAN" ? e = s.valueToCode(t, "NUM", u.DIVISION) || "0" : e = s.valueToCode(t, "NUM", u.NONE) || "0";
   let o;
   switch (n) {
     case "SIN":
@@ -7594,7 +7633,7 @@ s.forBlock.math_trig_v1 = function(t) {
       break;
   }
   if (o)
-    return [o, r.FUNCTION_CALL];
+    return [o, u.FUNCTION_CALL];
   switch (n) {
     case "ASIN":
       o = `Math.asin(${e}) / Math.PI * 180`;
@@ -7608,7 +7647,7 @@ s.forBlock.math_trig_v1 = function(t) {
     default:
       throw Error("Unknown math operator: " + n);
   }
-  return [o, r.DIVISION];
+  return [o, u.DIVISION];
 };
 const zs = C.xml, Zs = {
   init: function() {
@@ -7627,7 +7666,7 @@ E.object_create_item_v1 = ta;
 const ea = {
   init: function() {
     this.itemCount_ = 0, this.appendDummyInput().appendField("%{BKY_OBJECT_V1_CREATE_TITLE}"), this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["object_create_item_v1"],
         this
       )
@@ -7693,7 +7732,7 @@ const ea = {
   },
   updateShape_: function() {
     for (let t = 0; t < this.itemCount_; t++)
-      this.getInput("ADD" + t) || this.appendValueInput("ADD" + t).setAlign(y.Align.RIGHT).appendField(new ht("key"), "KEY" + t);
+      this.getInput("ADD" + t) || this.appendValueInput("ADD" + t).setAlign(v.Align.RIGHT).appendField(new ft("key"), "KEY" + t);
     for (let t = this.itemCount_; this.getInput("ADD" + t); t++)
       this.removeInput("ADD" + t);
   }
@@ -7703,10 +7742,10 @@ s.forBlock.object_create_v1 = function(t) {
   const e = t;
   let n = "{";
   for (let o = 0; o < e.itemCount_; o++) {
-    const i = e.getFieldValue("KEY" + o), a = s.valueToCode(e, "ADD" + o, r.ATOMIC) || null;
+    const i = e.getFieldValue("KEY" + o), a = s.valueToCode(e, "ADD" + o, u.ATOMIC) || null;
     n += s.quote_(i) + ": " + a, o < e.itemCount_ - 1 && (n += ", ");
   }
-  return n += "}", [n, r.ATOMIC];
+  return n += "}", [n, u.ATOMIC];
 };
 T([
   {
@@ -7771,7 +7810,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(obj, key) {
   }
 }
 `
-  ), n = s.valueToCode(t, "OBJECT", r.ATOMIC) || "null", o = s.valueToCode(t, "KEY", r.ATOMIC) || "''";
+  ), n = s.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = s.valueToCode(t, "KEY", u.ATOMIC) || "''";
   return `${e}(${n}, ${o});
 `;
 };
@@ -7794,7 +7833,7 @@ T([
   }
 ]);
 s.forBlock.object_from_json_v1 = function(t) {
-  return [`__parseJsonV1__(${s.valueToCode(t, "JSON", r.NONE) || "''"})`, r.FUNCTION_CALL];
+  return [`__parseJsonV1__(${s.valueToCode(t, "JSON", u.NONE) || "''"})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7850,8 +7889,8 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(obj, key) {
   }
 }
 `
-  ), n = s.valueToCode(t, "OBJECT", r.ATOMIC) || "null", o = s.valueToCode(t, "KEY", r.ATOMIC) || "''";
-  return [`${e}(${n}, ${o})`, r.FUNCTION_CALL];
+  ), n = s.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = s.valueToCode(t, "KEY", u.ATOMIC) || "''";
+  return [`${e}(${n}, ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -7915,7 +7954,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(obj, key, val) {
   }
 }
 `
-  ), n = s.valueToCode(t, "OBJECT", r.ATOMIC) || "null", o = s.valueToCode(t, "KEY", r.ATOMIC) || "''", i = s.valueToCode(t, "TO", r.ATOMIC) || "null";
+  ), n = s.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = s.valueToCode(t, "KEY", u.ATOMIC) || "''", i = s.valueToCode(t, "TO", u.ATOMIC) || "null";
   return `${e}(${n}, ${o}, ${i});
 `;
 };
@@ -7938,7 +7977,7 @@ T([
   }
 ]);
 s.forBlock.object_to_json_v1 = function(t) {
-  return [`__jsonStringifyV1__(${s.valueToCode(t, "OBJECT", r.NONE) || "null"})`, r.FUNCTION_CALL];
+  return [`__jsonStringifyV1__(${s.valueToCode(t, "OBJECT", u.NONE) || "null"})`, u.FUNCTION_CALL];
 };
 const Sn = C.xml, na = {
   init: function() {
@@ -7948,7 +7987,7 @@ const Sn = C.xml, na = {
 E.procedure_def_container_v1 = na;
 const oa = {
   init: function() {
-    const t = new ht(We.DEFAULT_ARG);
+    const t = new ft(We.DEFAULT_ARG);
     t.setValidator(this.validator_), this.appendDummyInput().appendField("%{BKY_PROCEDURE_V1_DEF_ITEM_TITLE}").appendField(t, "NAME"), this.setPreviousStatement(!0), this.setNextStatement(!0), this.setStyle("procedure_blocks"), this.contextMenu = !1;
   },
   validator_: function(t) {
@@ -7972,11 +8011,11 @@ E.procedure_def_item_v1 = oa;
 const ia = {
   init: function() {
     this.withReturn = !1, this.args = [];
-    const t = new ht(
+    const t = new ft(
       We.findLegalName("", this)
     );
     t.setValidator(We.rename), t.setSpellcheck(!1), this.appendDummyInput("DUMMY").appendField(t, "NAME"), this.appendStatementInput("HANDLE"), this.setMutator(
-      new Tt.MutatorIcon(
+      new Et.MutatorIcon(
         ["procedure_def_item_v1"],
         this
       )
@@ -8133,7 +8172,7 @@ const sa = C.xml, aa = {
 E.procedure_return_v1 = aa;
 s.forBlock.procedure_return_v1 = function(t) {
   const e = t;
-  return e.withReturn ? `return ${s.valueToCode(e, "VALUE", r.NONE) || "null"};
+  return e.withReturn ? `return ${s.valueToCode(e, "VALUE", u.NONE) || "null"};
 ` : `return;
 `;
 };
@@ -8150,10 +8189,10 @@ const ca = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_ASSET_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_ASSET_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("ASSET") || (this.appendValueInput("ASSET").setCheck("Resource").setAlign(y.Align.RIGHT).appendField("%{BKY_ASSET_ASSET}"), this.moveInputBefore("ASSET", "SUCCESS"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_ASSET_DO}"), this.getInput("DATA") || (this.appendValueInput("DATA"), this.moveInputBefore("DATA", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "DATA")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_ASSET_RETURN}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("ASSET") || (this.appendValueInput("ASSET").setCheck("Resource").setAlign(v.Align.RIGHT).appendField("%{BKY_ASSET_ASSET}"), this.moveInputBefore("ASSET", "SUCCESS"));
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || Y(this, [
+    this.isInsertionMarker() || F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0],
       ["DATA", "__data__", "x-runtime-lib.data", !0]
@@ -8162,7 +8201,7 @@ const ca = {
 };
 E.download_resource_v1 = ca;
 s.forBlock.download_resource_v1 = function(t) {
-  const e = s.valueToCode(t, "ASSET", r.ATOMIC) || null, n = s.statementToCode(t, "HANDLE");
+  const e = s.valueToCode(t, "ASSET", u.ATOMIC) || null, n = s.statementToCode(t, "HANDLE");
   return `{
   var res = __downloadResourceV1__(${e});
   var __success__ = res.success;
@@ -8182,8 +8221,8 @@ function io(t) {
     n.push({
       id: i.id,
       name: c
-    }), i.children.forEach((u) => {
-      o(u, c);
+    }), i.children.forEach((r) => {
+      o(r, c);
     });
   }
   return o(e.dirTree, ""), n;
@@ -8301,16 +8340,16 @@ const pa = {
     }, 0);
   },
   updateShape_: function() {
-    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_RESOURCE_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "RESULT")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_RESOURCE_RESULT}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("DATA") || (this.appendValueInput("DATA").setAlign(y.Align.RIGHT).appendField("%{BKY_RESOURCE_DATA}"), this.moveInputBefore("DATA", "SUCCESS")), this.getInput("DIR") || (this.appendValueInput("DIR").setCheck("SelectDir").setAlign(y.Align.RIGHT).appendField("%{BKY_RESOURCE_DIR}"), this.moveInputBefore("DIR", "DATA")), this.getInput("NAME") || (this.appendValueInput("NAME").setCheck("String").setAlign(y.Align.RIGHT).appendField("%{BKY_RESOURCE_NAME}"), this.moveInputBefore("NAME", "DIR"));
+    this.getInput("HANDLE") || this.appendStatementInput("HANDLE").appendField("%{BKY_RESOURCE_DO}"), this.getInput("RESULT") || (this.appendValueInput("RESULT"), this.moveInputBefore("RESULT", "HANDLE")), this.getInput("MESSAGE") || (this.appendValueInput("MESSAGE"), this.moveInputBefore("MESSAGE", "RESULT")), this.getInput("SUCCESS") || (this.appendValueInput("SUCCESS").appendField("%{BKY_RESOURCE_RESULT}"), this.moveInputBefore("SUCCESS", "MESSAGE")), this.getInput("DATA") || (this.appendValueInput("DATA").setAlign(v.Align.RIGHT).appendField("%{BKY_RESOURCE_DATA}"), this.moveInputBefore("DATA", "SUCCESS")), this.getInput("DIR") || (this.appendValueInput("DIR").setCheck("SelectDir").setAlign(v.Align.RIGHT).appendField("%{BKY_RESOURCE_DIR}"), this.moveInputBefore("DIR", "DATA")), this.getInput("NAME") || (this.appendValueInput("NAME").setCheck("String").setAlign(v.Align.RIGHT).appendField("%{BKY_RESOURCE_NAME}"), this.moveInputBefore("NAME", "DIR"));
   },
   updateShadow_: function() {
     if (this.isInsertionMarker())
       return;
-    const t = pt("");
+    const t = dt("");
     this.getInput("NAME")?.setShadowDom(t);
   },
   ensureBlocks_: function() {
-    this.isInsertionMarker() || Y(this, [
+    this.isInsertionMarker() || F(this, [
       ["SUCCESS", "__success__", "x-runtime-lib.success", !0],
       ["MESSAGE", "__message__", "x-runtime-lib.message", !0],
       ["RESULT", "__result__", "x-runtime-lib.result", !0]
@@ -8319,7 +8358,7 @@ const pa = {
 };
 E.upload_resource_v1 = pa;
 s.forBlock.upload_resource_v1 = function(t) {
-  const e = s.valueToCode(t, "NAME", r.ATOMIC) || "''", n = s.valueToCode(t, "DIR", r.ATOMIC) || "null", o = s.valueToCode(t, "DATA", r.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
+  const e = s.valueToCode(t, "NAME", u.ATOMIC) || "''", n = s.valueToCode(t, "DIR", u.ATOMIC) || "null", o = s.valueToCode(t, "DATA", u.ATOMIC) || "null", i = s.statementToCode(t, "HANDLE");
   return `{
   var res = __uploadResourceV1__(${e}, ${n}, ${o});
   var __success__ = res.success;
@@ -8348,11 +8387,11 @@ T([
   }
 ]);
 s.forBlock.text_v1 = function(t) {
-  return [s.quote_(t.getFieldValue("TEXT")), r.ATOMIC];
+  return [s.quote_(t.getFieldValue("TEXT")), u.ATOMIC];
 };
 const da = /^\s*'([^']|\\')*'\s*$/;
 function oe(t) {
-  return da.test(t) ? [t, r.ATOMIC] : [`String(${t})`, r.FUNCTION_CALL];
+  return da.test(t) ? [t, u.ATOMIC] : [`String(${t})`, u.FUNCTION_CALL];
 }
 B.register(
   "text_append_tooltip_v1",
@@ -8386,7 +8425,7 @@ s.forBlock.text_append_v1 = function(t) {
   const e = s.nameDB_?.getName(
     t.getFieldValue("VAR"),
     it.NameType.VARIABLE
-  ), n = s.valueToCode(t, "TEXT", r.NONE) || "''";
+  ), n = s.valueToCode(t, "TEXT", u.NONE) || "''";
   return `${e} += ${oe(n)};
 `;
 };
@@ -8424,7 +8463,7 @@ s.forBlock.text_change_case_v1 = function(t) {
   }[t.getFieldValue("CASE")], o = s.valueToCode(
     t,
     "TEXT",
-    n ? r.MEMBER : r.NONE
+    n ? u.MEMBER : u.NONE
   ) || "''";
   let i = "";
   return n ? i = o + n : i = s.provideFunction_(
@@ -8434,7 +8473,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(str) {
   return str.slice(0, 1).toUpperCase() + str.slice(1).toLowerCase();
 }
 `
-  ) + "(" + o + ")", [i, r.FUNCTION_CALL];
+  ) + "(" + o + ")", [i, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8460,8 +8499,8 @@ T([
   }
 ]);
 s.forBlock.text_char_at_v1 = function(t) {
-  const e = s.valueToCode(t, "VALUE", r.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
-  return [`${e}.charAt(${n})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = s.getAdjusted(t, "AT");
+  return [`${e}.charAt(${n})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8487,7 +8526,7 @@ T([
   }
 ]);
 s.forBlock.text_count_v1 = function(t) {
-  const e = s.valueToCode(t, "TEXT", r.NONE) || "''", n = s.valueToCode(t, "SUBSTR", r.NONE) || "''";
+  const e = s.valueToCode(t, "TEXT", u.NONE) || "''", n = s.valueToCode(t, "SUBSTR", u.NONE) || "''";
   return [`${s.provideFunction_(
     "textCount",
     `
@@ -8499,7 +8538,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle) {
   }
 }
 `
-  )}(${e}, ${n})`, r.FUNCTION_CALL];
+  )}(${e}, ${n})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8533,8 +8572,8 @@ T([
   }
 ]);
 s.forBlock.text_index_of_v1 = function(t) {
-  const e = t.getFieldValue("OP") === "FIRST" ? "indexOf" : "lastIndexOf", n = s.valueToCode(t, "TEXT", r.MEMBER) || "''", o = s.valueToCode(t, "SUBSTR", r.NONE) || "''";
-  return [`${n}.${e}(${o})`, r.FUNCTION_CALL];
+  const e = t.getFieldValue("OP") === "FIRST" ? "indexOf" : "lastIndexOf", n = s.valueToCode(t, "TEXT", u.MEMBER) || "''", o = s.valueToCode(t, "SUBSTR", u.NONE) || "''";
+  return [`${n}.${e}(${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8554,7 +8593,7 @@ T([
   }
 ]);
 s.forBlock.text_is_empty_v1 = function(t) {
-  return [`!${s.valueToCode(t, "VALUE", r.MEMBER) || "''"}.length`, r.LOGICAL_NOT];
+  return [`!${s.valueToCode(t, "VALUE", u.MEMBER) || "''"}.length`, u.LOGICAL_NOT];
 };
 const ha = C.xml, fa = {
   itemCount_: 0,
@@ -8623,7 +8662,7 @@ const ha = C.xml, fa = {
     for (let t = 0; t < this.itemCount_; t++)
       if (!this.getInput("ADD" + t)) {
         const e = this.appendValueInput("ADD" + t).setAlign(
-          y.Align.RIGHT
+          v.Align.RIGHT
         );
         t === 0 && e.appendField("%{BKY_TEXT_V1_JOIN_TITLE}");
       }
@@ -8631,7 +8670,7 @@ const ha = C.xml, fa = {
       this.removeInput("ADD" + t);
   }
 }, ma = function() {
-  this.itemCount_ = 2, this.updateShape_(), this.setMutator(new Tt.MutatorIcon(["text_join_item_v1"], this));
+  this.itemCount_ = 2, this.updateShape_(), this.setMutator(new Et.MutatorIcon(["text_join_item_v1"], this));
 };
 B.registerMutator(
   "text_join_mutator_v1",
@@ -8676,20 +8715,20 @@ s.forBlock.text_join_v1 = function(t) {
   const e = t;
   switch (e.itemCount_) {
     case 0:
-      return ["''", r.ATOMIC];
+      return ["''", u.ATOMIC];
     case 1: {
-      const n = s.valueToCode(e, "ADD0", r.NONE) || "''";
+      const n = s.valueToCode(e, "ADD0", u.NONE) || "''";
       return oe(n);
     }
     case 2: {
-      const n = s.valueToCode(e, "ADD0", r.NONE) || "''", o = s.valueToCode(e, "ADD1", r.NONE) || "''";
-      return [oe(n)[0] + " + " + oe(o)[0], r.ADDITION];
+      const n = s.valueToCode(e, "ADD0", u.NONE) || "''", o = s.valueToCode(e, "ADD1", u.NONE) || "''";
+      return [oe(n)[0] + " + " + oe(o)[0], u.ADDITION];
     }
     default: {
       const n = new Array(e.itemCount_);
       for (let i = 0; i < e.itemCount_; i++)
-        n[i] = s.valueToCode(e, "ADD" + i, r.NONE) || "''";
-      return ["[" + n.join(",") + "].join('')", r.FUNCTION_CALL];
+        n[i] = s.valueToCode(e, "ADD" + i, u.NONE) || "''";
+      return ["[" + n.join(",") + "].join('')", u.FUNCTION_CALL];
     }
   }
 };
@@ -8711,7 +8750,7 @@ T([
   }
 ]);
 s.forBlock.text_length_v1 = function(t) {
-  return [`${s.valueToCode(t, "VALUE", r.MEMBER) || "''"}.length`, r.MEMBER];
+  return [`${s.valueToCode(t, "VALUE", u.MEMBER) || "''"}.length`, u.MEMBER];
 };
 T([
   {
@@ -8742,7 +8781,7 @@ T([
   }
 ]);
 s.forBlock.text_replace_v1 = function(t) {
-  const e = s.valueToCode(t, "TEXT", r.NONE) || "''", n = s.valueToCode(t, "FROM", r.NONE) || "''", o = s.valueToCode(t, "TO", r.NONE) || "''";
+  const e = s.valueToCode(t, "TEXT", u.NONE) || "''", n = s.valueToCode(t, "FROM", u.NONE) || "''", o = s.valueToCode(t, "TO", u.NONE) || "''";
   return [`${s.provideFunction_(
     "textReplace",
     `
@@ -8752,7 +8791,7 @@ function ${s.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle, replacement) {
   return haystack.replace(new RegExp(needle, 'g'), replacement);
 }
 `
-  )}(${e}, ${n}, ${o})`, r.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8773,7 +8812,7 @@ T([
   }
 ]);
 s.forBlock.text_reverse_v1 = function(t) {
-  return [(s.valueToCode(t, "TEXT", r.MEMBER) || "''") + ".split('').reverse().join('')", r.FUNCTION_CALL];
+  return [(s.valueToCode(t, "TEXT", u.MEMBER) || "''") + ".split('').reverse().join('')", u.FUNCTION_CALL];
 };
 T([
   {
@@ -8799,8 +8838,8 @@ T([
   }
 ]);
 s.forBlock.text_split_v1 = function(t) {
-  const e = s.valueToCode(t, "TEXT", r.MEMBER) || "''", n = s.valueToCode(t, "DELIM", r.NONE) || "''";
-  return [`${e}.split(${n})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "TEXT", u.MEMBER) || "''", n = s.valueToCode(t, "DELIM", u.NONE) || "''";
+  return [`${e}.split(${n})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8831,8 +8870,8 @@ T([
   }
 ]);
 s.forBlock.text_substring_v1 = function(t) {
-  const e = s.valueToCode(t, "TEXT", r.MEMBER) || "''", n = s.getAdjusted(t, "START"), o = s.getAdjusted(t, "END", 1);
-  return [`${e}.slice(${n}, ${o})`, r.FUNCTION_CALL];
+  const e = s.valueToCode(t, "TEXT", u.MEMBER) || "''", n = s.getAdjusted(t, "START"), o = s.getAdjusted(t, "END", 1);
+  return [`${e}.slice(${n}, ${o})`, u.FUNCTION_CALL];
 };
 T([
   {
@@ -8861,12 +8900,12 @@ T([
   }
 ]);
 s.forBlock.text_trim_v1 = function(t) {
-  const e = s.valueToCode(t, "TEXT", r.NONE) || "''", o = {
+  const e = s.valueToCode(t, "TEXT", u.NONE) || "''", o = {
     BOTH: 0,
     LEFT: 1,
     RIGHT: 2
   }[t.getFieldValue("MODE")];
-  return [`__trimV1__(${e}, ${o})`, r.ATOMIC];
+  return [`__trimV1__(${e}, ${o})`, u.ATOMIC];
 };
 const Ta = {
   init: function() {
@@ -8879,7 +8918,7 @@ const Ta = {
     this.updateShape_(), this.updateShadow_();
   },
   updateShape_: function() {
-    this.getInput("CALLBACK") || this.appendStatementInput("CALLBACK").appendField("%{BKY_TIME_DO}"), this.getInput("IMMEDIATE") || (this.appendValueInput("IMMEDIATE").setCheck("Boolean").setAlign(y.Align.RIGHT).appendField("%{BKY_TIME_IMMEDIATE}"), this.moveInputBefore("IMMEDIATE", "CALLBACK")), this.getInput("COUNT") || (this.appendValueInput("COUNT").setCheck("Number").setAlign(y.Align.RIGHT).appendField("%{BKY_TIME_COUNT}"), this.moveInputBefore("COUNT", "IMMEDIATE")), this.getInput("LOOP") || (this.appendValueInput("LOOP").setCheck("Boolean").setAlign(y.Align.RIGHT).appendField("%{BKY_TIME_LOOP}"), this.moveInputBefore("LOOP", "COUNT")), this.getInput("INTERVAL") || (this.appendValueInput("INTERVAL").setCheck("Number").setAlign(y.Align.RIGHT).appendField("%{BKY_TIME_INTERVAL_MS}"), this.moveInputBefore("INTERVAL", "LOOP"));
+    this.getInput("CALLBACK") || this.appendStatementInput("CALLBACK").appendField("%{BKY_TIME_DO}"), this.getInput("IMMEDIATE") || (this.appendValueInput("IMMEDIATE").setCheck("Boolean").setAlign(v.Align.RIGHT).appendField("%{BKY_TIME_IMMEDIATE}"), this.moveInputBefore("IMMEDIATE", "CALLBACK")), this.getInput("COUNT") || (this.appendValueInput("COUNT").setCheck("Number").setAlign(v.Align.RIGHT).appendField("%{BKY_TIME_COUNT}"), this.moveInputBefore("COUNT", "IMMEDIATE")), this.getInput("LOOP") || (this.appendValueInput("LOOP").setCheck("Boolean").setAlign(v.Align.RIGHT).appendField("%{BKY_TIME_LOOP}"), this.moveInputBefore("LOOP", "COUNT")), this.getInput("INTERVAL") || (this.appendValueInput("INTERVAL").setCheck("Number").setAlign(v.Align.RIGHT).appendField("%{BKY_TIME_INTERVAL_MS}"), this.moveInputBefore("INTERVAL", "LOOP"));
   },
   updateShadow_: function() {
     if (this.isInsertionMarker())
@@ -8896,7 +8935,7 @@ const Ta = {
 };
 E.create_timer_v1 = Ta;
 s.forBlock.create_timer_v1 = function(t) {
-  const e = s.valueToCode(t, "INTERVAL", r.ATOMIC) || "1000", n = s.valueToCode(t, "LOOP", r.ATOMIC) || "false", o = s.valueToCode(t, "COUNT", r.ATOMIC) || "1", i = s.valueToCode(t, "IMMEDIATE", r.ATOMIC) || "false", a = s.statementToCode(t, "CALLBACK");
+  const e = s.valueToCode(t, "INTERVAL", u.ATOMIC) || "1000", n = s.valueToCode(t, "LOOP", u.ATOMIC) || "false", o = s.valueToCode(t, "COUNT", u.ATOMIC) || "1", i = s.valueToCode(t, "IMMEDIATE", u.ATOMIC) || "false", a = s.statementToCode(t, "CALLBACK");
   return `__createTimerV1__(${e}, ${n}, ${o}, ${i}, function() {
 ${a}});
 `;
@@ -8920,7 +8959,7 @@ T([
   }
 ]);
 s.forBlock.delay_v1 = function(t) {
-  return `__delayV1__(${s.valueToCode(t, "DURATION", r.ATOMIC) || "0"});
+  return `__delayV1__(${s.valueToCode(t, "DURATION", u.ATOMIC) || "0"});
 `;
 };
 const Ea = {
@@ -8955,12 +8994,12 @@ const Ea = {
 }, ga = function(t) {
   return function() {
     const e = t.workspace, o = t.getField("VAR").getVariable();
-    Nt.renameVariable(e, o);
+    St.renameVariable(e, o);
   };
 }, Aa = function(t) {
   return function() {
     const n = t.getField("VAR").getVariable();
-    n && Nt.deleteVariable(n.getWorkspace(), n, t);
+    n && St.deleteVariable(n.getWorkspace(), n, t);
   };
 };
 B.registerMixin(
@@ -8988,7 +9027,7 @@ s.forBlock.variable_get_v1 = function(t) {
   return [s.nameDB_.getName(
     t.getFieldValue("VAR"),
     it.NameType.VARIABLE
-  ), r.ATOMIC];
+  ), u.ATOMIC];
 };
 T([
   {
@@ -9017,7 +9056,7 @@ s.forBlock.variable_set_v1 = function(t) {
   const e = s.nameDB_.getName(
     t.getFieldValue("VAR"),
     it.NameType.VARIABLE
-  ), n = s.valueToCode(t, "VALUE", r.ASSIGNMENT) || "0";
+  ), n = s.valueToCode(t, "VALUE", u.ASSIGNMENT) || "0";
   return `${e} = ${n};
 `;
 };
@@ -9035,19 +9074,19 @@ Mn.setPrompt(async (t, e, n) => {
   });
   o !== void 0 && n(String(o));
 });
-const Qt = O.prototype;
-Qt.doClassValidation_ = function(t) {
+const zt = O.prototype;
+zt.doClassValidation_ = function(t) {
   return t;
 };
-const Ia = Qt.doValueUpdate_;
-Qt.doValueUpdate_ = function(t) {
+const Ia = zt.doValueUpdate_;
+zt.doValueUpdate_ = function(t) {
   Ia.call(this, t), this.selectedOption && this.selectedOption[1] !== t && (this.selectedOption = null);
 };
-const Oa = Qt.getText_;
-Qt.getText_ = function() {
+const Oa = zt.getText_;
+zt.getText_ = function() {
   if (this.selectedOption)
     return Oa.call(this);
-  const { i18n: t } = yt, e = this.getSourceBlock();
+  const { i18n: t } = kt, e = this.getSourceBlock();
   if (this.name === "APP")
     return e.app.name;
   if (this.name === "PAGE")
@@ -9068,7 +9107,7 @@ Qt.getText_ = function() {
     return console.log(e.event), Ie(n, o);
   } else if (this.name === "METHOD") {
     const { kind: n, names: o } = e.method;
-    return ve(n, o);
+    return ye(n, o);
   } else {
     if (this.name === "SPACE")
       return e.space.name;
@@ -9092,22 +9131,22 @@ So.prototype.cleanUp = function() {
   this.setResizesEnabled(!1);
   const t = I.getGroup();
   t || I.setGroup(!0);
-  const e = this.getTopBlocks(!0), n = e.filter((u) => u.isMovable()), i = e.filter((u) => !u.isMovable()).map(
-    (u) => u.getBoundingRectangle()
-  ), a = function(u) {
+  const e = this.getTopBlocks(!0), n = e.filter((r) => r.isMovable()), i = e.filter((r) => !r.isMovable()).map(
+    (r) => r.getBoundingRectangle()
+  ), a = function(r) {
     for (const l of i)
-      if (u.intersects(l))
+      if (r.intersects(l))
         return l;
     return null;
   };
   let c = 0;
-  for (const u of n) {
-    let l = u.getBoundingRectangle();
-    u.moveBy(-l.left, c - l.top, ["cleanup"]), u.snapToGrid(), l = u.getBoundingRectangle();
+  for (const r of n) {
+    let l = r.getBoundingRectangle();
+    r.moveBy(-l.left, c - l.top, ["cleanup"]), r.snapToGrid(), l = r.getBoundingRectangle();
     let _ = a(l);
     for (; _ != null; )
-      c = _.top + _.getHeight() + Bn, u.moveBy(0, c - l.top, ["cleanup"]), u.snapToGrid(), l = u.getBoundingRectangle(), _ = a(l);
-    c = u.getRelativeToSurfaceXY().y + u.getHeightWidth().height + Bn;
+      c = _.top + _.getHeight() + Bn, r.moveBy(0, c - l.top, ["cleanup"]), r.snapToGrid(), l = r.getBoundingRectangle(), _ = a(l);
+    c = r.getRelativeToSurfaceXY().y + r.getHeightWidth().height + Bn;
   }
   I.setGroup(t), this.setResizesEnabled(!0);
 };
@@ -9115,7 +9154,7 @@ function co(t) {
   const e = t.getParent();
   return e && co(e) ? !0 : !e && !!(t.outputConnection || t.previousConnection);
 }
-class va {
+class ya {
   init() {
     const e = Bo.registry.getItem("blockDisable");
     e && (e.preconditionFn = function(n) {
@@ -9126,12 +9165,12 @@ class va {
 }
 bo.registerFieldColour();
 Po.registry.unregister(Ro.names.ESCAPE);
-const ya = new Do.CrossTabCopyPaste();
-ya.init({ contextMenu: !0, shortcut: !0 });
-const Ca = new va();
+const va = new Do.CrossTabCopyPaste();
+va.init({ contextMenu: !0, shortcut: !0 });
+const Ca = new ya();
 Ca.init();
 function un(t) {
-  const e = Wt();
+  const e = jt();
   if (!e)
     return;
   const n = e.getBlockById(t);
@@ -9144,7 +9183,7 @@ function un(t) {
   e.scroll(-a, -c);
 }
 function ro() {
-  const t = Wt();
+  const t = jt();
   if (!t)
     return;
   const e = t.getTopBlocks(!0)?.[0];
@@ -9335,7 +9374,7 @@ const ka = Un.defineTheme("light", {
   }
 });
 function La(t) {
-  const e = Wt();
+  const e = jt();
   switch (t) {
     case "light":
       e.setTheme(ka);
@@ -9346,7 +9385,7 @@ function La(t) {
   }
 }
 const en = ["get_app_property_v1", "get_app_state_v1"];
-function ut(t, e) {
+function lt(t, e) {
   return t.find((o) => o === e) !== void 0 ? !1 : (t.push(e), !0);
 }
 function Sa(t) {
@@ -9362,15 +9401,15 @@ function Ba(t) {
   for (const n of t)
     if (n.type === "get_app_property_v1") {
       const o = n;
-      ut(
+      lt(
         e,
-        Ot({
+        yt({
           type: "elementProperty",
           nodeId: o.node.id,
           propertyKeys: o.property.key
         })
       );
-    } else n.type === "get_app_state_v1" ? ut(e, Ot({ type: "state", stateId: n.state.id })) : console.assert(!1);
+    } else n.type === "get_app_state_v1" ? lt(e, yt({ type: "state", stateId: n.state.id })) : console.assert(!1);
   return e;
 }
 function ba(t) {
@@ -9400,48 +9439,48 @@ function Pa(t) {
       } : (i.property.kind === "elementSlotProperty" || i.property.kind === "customSlotProperty") && (a = {
         type: "adaptSlotProperty",
         propertyId: i.property.key
-      }), !a || !ut(n, Ot(a)))
+      }), !a || !lt(n, yt(a)))
         continue;
       e.push(a);
     } else if (o.type === "get_app_state_v1") {
       const a = { type: "state", stateId: o.state.id };
-      if (!ut(n, Ot(a)))
+      if (!lt(n, yt(a)))
         continue;
       e.push(a);
     } else if (o.type === "object_get_v1") {
       const i = o.getInputTargetBlock("OBJECT"), a = s.valueToCode(
         o,
         "KEY",
-        r.ATOMIC
+        u.ATOMIC
       );
       if (i.type === "get_app_property_v1") {
         const c = i;
-        let u;
-        if (c.property.kind === "elementProperty" ? u = {
+        let r;
+        if (c.property.kind === "elementProperty" ? r = {
           type: "elementProperty",
           nodeId: c.node.id,
           propertyKeys: c.property.key,
           subKeys: a
-        } : c.property.kind === "customProperty" ? u = {
+        } : c.property.kind === "customProperty" ? r = {
           type: "customProperty",
           propertyId: c.property.key,
           subKeys: a
-        } : (c.property.kind === "elementSlotProperty" || c.property.kind === "customSlotProperty") && (u = {
+        } : (c.property.kind === "elementSlotProperty" || c.property.kind === "customSlotProperty") && (r = {
           type: "adaptSlotProperty",
           propertyId: c.property.key,
           subKeys: a
-        }), !u || !ut(n, Ot(u)))
+        }), !r || !lt(n, yt(r)))
           continue;
-        e.push(u);
+        e.push(r);
       } else if (i.type === "get_app_state_v1") {
-        const u = {
+        const r = {
           type: "state",
           stateId: i.state.id,
           subKeys: a
         };
-        if (!ut(n, Ot(u)))
+        if (!lt(n, yt(r)))
           continue;
-        e.push(u);
+        e.push(r);
       } else
         console.assert(!1);
     } else
@@ -9462,13 +9501,13 @@ function Ra(t) {
     if (o.type === "watch_effect_v1") {
       const i = Sa(o), a = Ba(i);
       for (const c of a)
-        e.watchEffect[c] || (e.watchEffect[c] = []), ut(e.watchEffect[c], o.id);
+        e.watchEffect[c] || (e.watchEffect[c] = []), lt(e.watchEffect[c], o.id);
     } else if (o.type === "app_bind_v1") {
       const i = ba(o), a = Pa(i);
       e.bind.sets[o.id] = a;
       for (const c of a) {
-        const u = Ot(c);
-        e.bind.triggers[u] || (e.bind.triggers[u] = []), ut(e.bind.triggers[u], o.id);
+        const r = yt(c);
+        e.bind.triggers[r] || (e.bind.triggers[r] = []), lt(e.bind.triggers[r], o.id);
       }
     }
   return e;
@@ -9480,13 +9519,13 @@ function Da(t) {
 function ln() {
   return Qo(uo);
 }
-const Ma = /* @__PURE__ */ ct({
+const Ma = /* @__PURE__ */ rt({
   __name: "index",
   props: {
     lock: { type: Boolean }
   },
   setup(t, { expose: e }) {
-    const { t: n } = Xt(), o = t, i = ln(), a = () => {
+    const { t: n } = Jt(), o = t, i = ln(), a = () => {
       if (!i.workspace) {
         console.assert(!1);
         return;
@@ -9499,7 +9538,7 @@ const Ma = /* @__PURE__ */ ct({
     }, c = () => {
       a();
     };
-    return e({ cleanWorkspace: a }), (u, l) => {
+    return e({ cleanWorkspace: a }), (r, l) => {
       const _ = M("v-btn"), d = M("v-tooltip");
       return S(), st(d, {
         text: D(n)("x-block-lib.tip.hotkeyCtrlQ")
@@ -9516,7 +9555,7 @@ const Ma = /* @__PURE__ */ ct({
       }, 8, ["text"]);
     };
   }
-}), Ua = /* @__PURE__ */ ct({
+}), Ua = /* @__PURE__ */ rt({
   __name: "index",
   props: {
     modelValue: { type: Boolean, required: !0 },
@@ -9524,14 +9563,14 @@ const Ma = /* @__PURE__ */ ct({
   },
   emits: ["update:modelValue"],
   setup(t) {
-    const { t: e } = Xt(), n = Kt(t, "modelValue");
+    const { t: e } = Jt(), n = $t(t, "modelValue");
     return (o, i) => {
       const a = M("v-btn"), c = M("v-tooltip");
       return S(), st(c, {
         text: D(e)("x-block-lib.tip.hotkeyCtrlW")
       }, {
-        activator: at(({ props: u }) => [
-          L(a, sn(u, {
+        activator: at(({ props: r }) => [
+          L(a, sn(r, {
             density: "comfortable",
             icon: n.value ? "mdi-lock" : "mdi-lock-open",
             variant: "outlined",
@@ -9546,7 +9585,7 @@ const Ma = /* @__PURE__ */ ct({
   key: 0,
   class: "text-cation text-grey text-truncate ml-6",
   style: { maxWidth: "340px" }
-}, Fa = /* @__PURE__ */ ct({
+}, Fa = /* @__PURE__ */ rt({
   __name: "item",
   props: {
     id: {},
@@ -9556,14 +9595,14 @@ const Ma = /* @__PURE__ */ ct({
   },
   emits: ["x-click"],
   setup(t, { emit: e }) {
-    const { primaryColor: n, backgroundColor2: o, highlightColor: i } = jt(), a = t, c = e, u = Lt(!1), l = F(() => ({
+    const { primaryColor: n, backgroundColor2: o, highlightColor: i } = Xt(), a = t, c = e, r = Bt(!1), l = w(() => ({
       position: "relative",
-      background: u.value ? i.value : o.value,
+      background: r.value ? i.value : o.value,
       width: "100%",
       height: "48px",
       marginBottom: "1px",
       userSelect: "none"
-    })), _ = F(() => ({
+    })), _ = w(() => ({
       display: a.select ? "block" : "none",
       position: "absolute",
       top: "0px",
@@ -9579,21 +9618,21 @@ const Ma = /* @__PURE__ */ ct({
         class: "d-flex align-center cursor-pointer",
         style: j(l.value),
         onClick: h[1] || (h[1] = (R) => c("x-click", a.id)),
-        onMouseout: h[2] || (h[2] = (R) => u.value = !1),
-        onMouseover: h[3] || (h[3] = (R) => u.value = !0)
+        onMouseout: h[2] || (h[2] = (R) => r.value = !1),
+        onMouseover: h[3] || (h[3] = (R) => r.value = !0)
       }, [
-        w("div", Va, [
-          w("span", xa, $t(a.title), 1),
-          a.desc ? (S(), tt("span", Ya, $t(a.desc), 1)) : rt("", !0)
+        K("div", Va, [
+          K("span", xa, Ht(a.title), 1),
+          a.desc ? (S(), tt("span", Ya, Ht(a.desc), 1)) : ut("", !0)
         ]),
         L(p),
         L(m, {
           class: "x-handle cursor-move mr-3",
           icon: "mdi-drag-horizontal-variant",
-          onMousedown: h[0] || (h[0] = Ft(() => {
+          onMousedown: h[0] || (h[0] = wt(() => {
           }, ["stop"]))
         }),
-        w("div", {
+        K("div", {
           style: j(_.value)
         }, null, 4)
       ], 36)), [
@@ -9604,7 +9643,7 @@ const Ma = /* @__PURE__ */ ct({
 }), wa = {
   key: 1,
   class: "text-caption text-grey"
-}, Ka = /* @__PURE__ */ ct({
+}, Ka = /* @__PURE__ */ rt({
   __name: "index",
   props: /* @__PURE__ */ je({
     lock: { type: Boolean }
@@ -9614,7 +9653,7 @@ const Ma = /* @__PURE__ */ ct({
   }),
   emits: ["update:modelValue"],
   setup(t, { expose: e }) {
-    const { t: n } = Xt(), o = Kt(t, "modelValue"), i = ln(), a = Lt([]);
+    const { t: n } = Jt(), o = $t(t, "modelValue"), i = ln(), a = Bt([]);
     e({ update: () => {
       if (!i.workspace) {
         console.assert(!1);
@@ -9625,26 +9664,26 @@ const Ma = /* @__PURE__ */ ct({
         const R = A.id === Uo()?.id;
         let P = "";
         if (A.type.startsWith("on_app_event_v")) {
-          const G = A, Ct = et[G.node.key];
-          Ct && (P = n(Ct.name), G.node.alias && (P += " / " + G.node.alias), P += " - " + Ie(G.event.kind, G.event.names));
+          const G = A, Nt = et[G.node.key];
+          Nt && (P = n(Nt.name), G.node.alias && (P += " / " + G.node.alias), P += " - " + Ie(G.event.kind, G.event.names));
         } else if (A.type.startsWith("watch_effect_v"))
           P = n("x-block-lib.watchEffect");
         else if (A.type.startsWith("app_bind_v"))
           P = n("x-block-lib.bind");
         else if (A.type.startsWith("implement_app_method_v")) {
           const G = A;
-          P = n("x-block-lib.implementMethod"), P += " - " + ve(G.method.kind, G.method.names);
+          P = n("x-block-lib.implementMethod"), P += " - " + ye(G.method.kind, G.method.names);
         } else A.type.startsWith("func_entry_v") ? P = n("x-block-lib.funcEntry") : A.type.startsWith("procedure_def_v") ? P = n("x-block-lib.procedure") + " - " + A.getFieldValue("NAME") : P = n("x-block-lib.temporaryBlock");
-        const At = A.getCommentText() ?? "";
+        const It = A.getCommentText() ?? "";
         p.push({
           id: A.id,
           name: P,
-          desc: At,
+          desc: It,
           select: R
         });
       }), a.value = p;
     } });
-    let u = [];
+    let r = [];
     const l = () => {
       if (t.lock) {
         xn(n("x-block-lib.msg.cannotOperateInLockedState"));
@@ -9653,7 +9692,7 @@ const Ma = /* @__PURE__ */ ct({
       const p = [];
       a.value.forEach(({ id: m }) => {
         p.push(m);
-      }), u = p;
+      }), r = p;
     }, _ = () => !t.lock, d = (p) => {
       if (!i.workspace) {
         console.assert(!1);
@@ -9665,7 +9704,7 @@ const Ma = /* @__PURE__ */ ct({
       }
       if (p.oldIndex === p.newIndex)
         return;
-      const m = u[p.oldIndex], A = i.workspace.getBlockById(
+      const m = r[p.oldIndex], A = i.workspace.getBlockById(
         m
       );
       if (!A) {
@@ -9673,13 +9712,13 @@ const Ma = /* @__PURE__ */ ct({
         return;
       }
       let R = "";
-      p.newIndex > p.oldIndex ? R = u[p.newIndex] : p.newIndex > 0 && (R = u[p.newIndex - 1]);
+      p.newIndex > p.oldIndex ? R = r[p.newIndex] : p.newIndex > 0 && (R = r[p.newIndex - 1]);
       let P = -10;
       R !== "" && (P = i.workspace.getBlockById(
         R
       ).getRelativeToSurfaceXY().y + 10);
-      const At = A.getRelativeToSurfaceXY();
-      A.moveTo(new C.Coordinate(At.x, P)), i.workspace.cleanUp(), ro();
+      const It = A.getRelativeToSurfaceXY();
+      A.moveTo(new C.Coordinate(It.x, P)), i.workspace.cleanUp(), ro();
     }, h = async (p) => {
       if (!i.workspace) {
         console.assert(!1);
@@ -9710,14 +9749,14 @@ const Ma = /* @__PURE__ */ ct({
         }, null, 8, ["id", "desc", "select", "title"]))), 128))
       ]),
       _: 1
-    }, 8, ["modelValue"])) : (S(), tt("span", wa, $t(D(n)("x-block-lib.noOption")), 1));
+    }, 8, ["modelValue"])) : (S(), tt("span", wa, Ht(D(n)("x-block-lib.noOption")), 1));
   }
 }), $a = (t, e) => {
   const n = t.__vccOpts || t;
   for (const [o, i] of e)
     n[o] = i;
   return n;
-}, Ha = /* @__PURE__ */ $a(Ka, [["__scopeId", "data-v-daa85471"]]), Ga = /* @__PURE__ */ ct({
+}, Ha = /* @__PURE__ */ $a(Ka, [["__scopeId", "data-v-daa85471"]]), Ga = /* @__PURE__ */ rt({
   __name: "index",
   props: {
     modelValue: { type: Boolean, required: !0 },
@@ -9725,7 +9764,7 @@ const Ma = /* @__PURE__ */ ct({
   },
   emits: ["update:modelValue"],
   setup(t, { expose: e }) {
-    const n = Kt(t, "modelValue"), o = ln();
+    const n = $t(t, "modelValue"), o = ln();
     e({ update: () => {
       if (!o.workspace) {
         console.assert(!1);
@@ -9733,49 +9772,49 @@ const Ma = /* @__PURE__ */ ct({
       }
     } });
     const a = (c) => {
-      const u = Wt();
-      if (!u) {
+      const r = jt();
+      if (!r) {
         console.assert(!1);
         return;
       }
-      const l = u.getBlockById(c);
+      const l = r.getBlockById(c);
       Vn.setSelected(l), un(c), n.value = !1;
     };
-    return (c, u) => (S(), tt("div", {
-      onClick: u[0] || (u[0] = (l) => a(""))
+    return (c, r) => (S(), tt("div", {
+      onClick: r[0] || (r[0] = (l) => a(""))
     }, "blockTree"));
   }
-}), Wa = { class: "text-subtitle-1" }, ja = /* @__PURE__ */ ct({
+}), Wa = { class: "text-subtitle-1" }, ja = /* @__PURE__ */ rt({
   __name: "index",
   props: {
     type: {},
     lock: { type: Boolean }
   },
   setup(t, { expose: e }) {
-    const { t: n } = Xt(), o = ii(), { sysBarAvail: i } = Yn(), { backgroundColor1: a } = jt(), c = F(() => {
+    const { t: n } = Jt(), o = ii(), { sysBarAvail: i } = Yn(), { backgroundColor1: a } = Xt(), c = w(() => {
       let m = "100%";
       return o.mdAndUp.value && (m = "400px"), {
         background: a.value,
         width: m,
         height: "100%"
       };
-    }), u = F(() => {
+    }), r = w(() => {
       let m = 48;
       return i.value && (m += 24), {
         position: "relative",
         height: `calc(100% - ${m}px)`
       };
-    }), l = F(() => ({
+    }), l = w(() => ({
       height: "60px"
     })), { open: _ } = nn(`blocklyNavigatorDlg${Xe()}`);
     ei(() => {
       _.value = !1;
     });
-    const d = wt("blockList"), h = wt("blockTree");
+    const d = Kt("blockList"), h = Kt("blockTree");
     return e({ open: _, update: () => {
       t.type === "list" ? d.value?.update() : t.type === "tree" && h.value?.update();
     } }), (m, A) => {
-      const R = M("v-sheet"), P = M("v-btn"), At = M("v-spacer"), G = M("v-dialog"), Ct = M("v-tooltip");
+      const R = M("v-sheet"), P = M("v-btn"), It = M("v-spacer"), G = M("v-dialog"), Nt = M("v-tooltip");
       return S(), tt(Kn, null, [
         L(G, {
           modelValue: D(_),
@@ -9785,15 +9824,15 @@ const Ma = /* @__PURE__ */ ct({
           "no-click-animation": "",
           persistent: "",
           transition: "scroll-x-reverse-transition",
-          onKeydown: A[6] || (A[6] = $n(Ft((W) => _.value = !1, ["stop", "prevent"]), ["esc"]))
+          onKeydown: A[6] || (A[6] = $n(wt((W) => _.value = !1, ["stop", "prevent"]), ["esc"]))
         }, {
           default: at(() => [
-            w("div", {
+            K("div", {
               class: "w-100 h-100 d-flex flex-row-reverse",
-              onClick: A[3] || (A[3] = Ft((W) => _.value = !1, ["self"])),
-              onContextmenu: A[4] || (A[4] = Ft((W) => _.value = !1, ["self", "prevent"]))
+              onClick: A[3] || (A[3] = wt((W) => _.value = !1, ["self"])),
+              onContextmenu: A[4] || (A[4] = wt((W) => _.value = !1, ["self", "prevent"]))
             }, [
-              w("div", {
+              K("div", {
                 class: "elevation-2",
                 style: j(c.value)
               }, [
@@ -9801,7 +9840,7 @@ const Ma = /* @__PURE__ */ ct({
                   key: 0,
                   color: "transparent",
                   height: 24
-                })) : rt("", !0),
+                })) : ut("", !0),
                 L(R, {
                   class: "d-flex align-center px-2",
                   color: "transparent",
@@ -9814,14 +9853,14 @@ const Ma = /* @__PURE__ */ ct({
                       variant: "text",
                       onClick: A[0] || (A[0] = (W) => _.value = !1)
                     }),
-                    w("span", Wa, $t(D(n)("x-block-lib.navigator")), 1),
-                    L(At)
+                    K("span", Wa, Ht(D(n)("x-block-lib.navigator")), 1),
+                    L(It)
                   ]),
                   _: 1
                 }),
-                w("div", {
+                K("div", {
                   class: "overflow-y-auto",
-                  style: j(u.value)
+                  style: j(r.value)
                 }, [
                   t.type === "list" ? (S(), st(Ha, {
                     key: 0,
@@ -9836,8 +9875,8 @@ const Ma = /* @__PURE__ */ ct({
                     ref: h,
                     modelValue: D(_),
                     "onUpdate:modelValue": A[2] || (A[2] = (W) => ne(_) ? _.value = W : null)
-                  }, null, 8, ["modelValue"])) : rt("", !0),
-                  w("div", {
+                  }, null, 8, ["modelValue"])) : ut("", !0),
+                  K("div", {
                     style: j(l.value)
                   }, null, 4)
                 ], 4)
@@ -9846,7 +9885,7 @@ const Ma = /* @__PURE__ */ ct({
           ]),
           _: 1
         }, 8, ["modelValue"]),
-        L(Ct, {
+        L(Nt, {
           text: D(n)("x-block-lib.tip.hotkeyCtrlE")
         }, {
           activator: at(({ props: W }) => [
@@ -9862,55 +9901,55 @@ const Ma = /* @__PURE__ */ ct({
       ], 64);
     };
   }
-}), x = C.xml;
-function V(t) {
-  const e = x.createElement("label");
+}), Y = C.xml;
+function x(t) {
+  const e = Y.createElement("label");
   return e.setAttribute("text", t), e;
 }
-function v(t, e) {
-  const n = x.createElement("block");
+function y(t, e) {
+  const n = Y.createElement("block");
   if (n.setAttribute("type", t), e)
     for (const o of e)
       n.appendChild(o);
   return n;
 }
 function lo(t) {
-  const e = x.createElement("mutation");
+  const e = Y.createElement("mutation");
   for (const { key: n, value: o } of t)
     e.setAttribute(n, o);
   return e;
 }
-function bt(t, e) {
+function Rt(t, e) {
   e === void 0 && (e = "");
-  const n = x.createElement("value");
+  const n = Y.createElement("value");
   n.setAttribute("name", t);
-  const o = x.createElement("shadow");
+  const o = Y.createElement("shadow");
   o.setAttribute("type", "text_v1");
-  const i = x.createElement("field");
+  const i = Y.createElement("field");
   i.setAttribute("name", "TEXT");
-  const a = x.createTextNode(e);
+  const a = Y.createTextNode(e);
   return i.appendChild(a), o.appendChild(i), n.appendChild(o), n;
 }
 function bn(t, e) {
   e === void 0 && (e = 0);
-  const n = x.createElement("value");
+  const n = Y.createElement("value");
   n.setAttribute("name", t);
-  const o = x.createElement("shadow");
+  const o = Y.createElement("shadow");
   o.setAttribute("type", "math_number_v1");
-  const i = x.createElement("field");
+  const i = Y.createElement("field");
   i.setAttribute("name", "NUM");
-  const a = x.createTextNode(String(e));
+  const a = Y.createTextNode(String(e));
   return i.appendChild(a), o.appendChild(i), n.appendChild(o), n;
 }
 function Xa(t, e) {
   e === void 0 && (e = !1);
-  const n = x.createElement("value");
+  const n = Y.createElement("value");
   n.setAttribute("name", t);
-  const o = x.createElement("shadow");
+  const o = Y.createElement("shadow");
   o.setAttribute("type", "logic_boolean_v1");
-  const i = x.createElement("field");
+  const i = Y.createElement("field");
   i.setAttribute("name", "BOOL");
-  const a = x.createTextNode(e ? "TRUE" : "FALSE");
+  const a = Y.createTextNode(e ? "TRUE" : "FALSE");
   return i.appendChild(a), o.appendChild(i), n.appendChild(o), n;
 }
 function Ja() {
@@ -9936,19 +9975,19 @@ function Qa() {
 }
 function za() {
   const t = [];
-  return t.push(V(f("LABEL_EVENT"))), X("onEvent") && t.push(v("on_app_event_v1")), Ja() && t.push(v("trigger_app_event_v1")), t.push(
-    v("app_bind_v1", [lo([{ key: "items", value: "2" }])])
-  ), t.push(v("watch_effect_v1")), (X("getProperty") || X("setProperty")) && t.push(V(f("LABEL_PROPERTY"))), X("getProperty") && t.push(v("get_app_property_v1")), X("setProperty") && t.push(v("set_app_property_v1")), qa() && (t.push(V(f("LABEL_STATE"))), t.push(v("get_app_state_v1")), t.push(v("set_app_state_v1"))), (X("callMethod") || Pn()) && t.push(V(f("LABEL_METHOD"))), X("callMethod") && t.push(v("call_app_method_v1")), Pn() && (t.push(v("implement_app_method_v1")), Qa() && t.push(v("set_app_method_output_v1")), t.push(v("procedure_return_v1"))), t;
+  return t.push(x(f("LABEL_EVENT"))), X("onEvent") && t.push(y("on_app_event_v1")), Ja() && t.push(y("trigger_app_event_v1")), t.push(
+    y("app_bind_v1", [lo([{ key: "items", value: "2" }])])
+  ), t.push(y("watch_effect_v1")), (X("getProperty") || X("setProperty")) && t.push(x(f("LABEL_PROPERTY"))), X("getProperty") && t.push(y("get_app_property_v1")), X("setProperty") && t.push(y("set_app_property_v1")), qa() && (t.push(x(f("LABEL_STATE"))), t.push(y("get_app_state_v1")), t.push(y("set_app_state_v1"))), (X("callMethod") || Pn()) && t.push(x(f("LABEL_METHOD"))), X("callMethod") && t.push(y("call_app_method_v1")), Pn() && (t.push(y("implement_app_method_v1")), Qa() && t.push(y("set_app_method_output_v1")), t.push(y("procedure_return_v1"))), t;
 }
 const _o = { name: "APP_COMP_CATEGORY", callback: za };
 function Za() {
   const t = [];
-  return t.push(V(f("LABEL_FUNC"))), t.push(V(f("LABEL_FLOW"))), t;
+  return t.push(x(f("LABEL_FUNC"))), t.push(x(f("LABEL_FLOW"))), t;
 }
 const pe = { name: "APP_COMPUTE_CATEGORY", callback: Za };
 function tc() {
   const t = [];
-  return t.push(v("app_debug_trace_v1", [bt("OBJECT")])), t.push(v("popup_message_v1", [bt("TEXT")])), t.push(v("open_confirm_dlg_v1")), t.push(v("open_prompt_dlg_v1")), t;
+  return t.push(y("app_debug_trace_v1", [Rt("OBJECT")])), t.push(y("popup_message_v1", [Rt("TEXT")])), t.push(y("open_confirm_dlg_v1")), t.push(y("open_prompt_dlg_v1")), t;
 }
 const de = { name: "APP_MESSAGE_CATEGORY", callback: tc };
 function ec() {
@@ -9959,7 +9998,7 @@ function ec() {
 }
 function nc() {
   const t = [];
-  return t.push(v("app_env_is_v1")), ec() && t.push(v("navigate_to_v1")), t;
+  return t.push(y("app_env_is_v1")), ec() && t.push(y("navigate_to_v1")), t;
 }
 const he = { name: "APP_MISC_CATEGORY", callback: nc };
 function oc() {
@@ -9972,14 +10011,14 @@ function ic() {
 }
 function sc() {
   const t = [];
-  return t.push(V(f("LABEL_EVENT"))), X("onEvent") && t.push(v("on_app_event_v1")), t.push(
-    v("app_bind_v1", [lo([{ key: "items", value: "2" }])])
-  ), t.push(v("watch_effect_v1")), (X("getProperty") || X("setProperty")) && t.push(V(f("LABEL_PROPERTY"))), X("getProperty") && t.push(v("get_app_property_v1")), X("setProperty") && t.push(v("set_app_property_v1")), oc() && (t.push(V(f("LABEL_STATE"))), t.push(v("get_app_state_v1")), t.push(v("set_app_state_v1"))), X("callMethod") && (t.push(V(f("LABEL_METHOD"))), t.push(v("call_app_method_v1"))), ic() && (t.push(V(f("LABEL_ARGUMENT"))), t.push(v("get_page_argument_v1"))), t;
+  return t.push(x(f("LABEL_EVENT"))), X("onEvent") && t.push(y("on_app_event_v1")), t.push(
+    y("app_bind_v1", [lo([{ key: "items", value: "2" }])])
+  ), t.push(y("watch_effect_v1")), (X("getProperty") || X("setProperty")) && t.push(x(f("LABEL_PROPERTY"))), X("getProperty") && t.push(y("get_app_property_v1")), X("setProperty") && t.push(y("set_app_property_v1")), oc() && (t.push(x(f("LABEL_STATE"))), t.push(y("get_app_state_v1")), t.push(y("set_app_state_v1"))), X("callMethod") && (t.push(x(f("LABEL_METHOD"))), t.push(y("call_app_method_v1"))), ic() && (t.push(x(f("LABEL_ARGUMENT"))), t.push(y("get_page_argument_v1"))), t;
 }
 const po = { name: "APP_PAGE_CATEGORY", callback: sc };
 function ac() {
   const t = [];
-  return t.push(V(f("LABEL_RESOURCE"))), t.push(v("upload_resource_v1")), t;
+  return t.push(x(f("LABEL_RESOURCE"))), t.push(y("upload_resource_v1")), t;
 }
 const fe = { name: "APP_RESOURCE_CATEGORY", callback: ac }, xt = C.xml;
 function cc() {
@@ -10005,14 +10044,14 @@ function cc() {
   }
   return t;
 }
-const lt = {
+const _t = {
   name: "PROCEDURE_CATEGORY",
   callback: cc
-}, te = C.xml;
+}, ee = C.xml;
 function rc() {
-  const t = Wt(), e = [];
+  const t = jt(), e = [];
   {
-    const o = te.createElement("label");
+    const o = ee.createElement("label");
     o.setAttribute("text", "%{BKY_LABEL_VARIABLE}"), e.push(o);
   }
   {
@@ -10020,7 +10059,7 @@ function rc() {
     o.setAttribute("text", "%{BKY_NEW_VARIABLE}"), o.setAttribute("callbackKey", "CREATE_VARIABLE"), t.registerButtonCallback(
       "CREATE_VARIABLE",
       function(i) {
-        Nt.createVariableButtonHandler(
+        St.createVariableButtonHandler(
           i.getTargetWorkspace()
         );
       }
@@ -10029,39 +10068,39 @@ function rc() {
   const n = t.getVariablesOfType("");
   if (n.length <= 0)
     return e;
-  n.sort(Nt.compareByName);
+  n.sort(St.compareByName);
   {
-    const o = te.createElement("label");
+    const o = ee.createElement("label");
     o.setAttribute("text", f("LABEL_CREATED")), e.push(o);
   }
   return n.forEach((o) => {
     {
-      const i = te.createElement("block");
-      i.setAttribute("type", "variable_get_v1"), i.appendChild(Nt.generateVariableFieldDom(o)), e.push(i);
+      const i = ee.createElement("block");
+      i.setAttribute("type", "variable_get_v1"), i.appendChild(St.generateVariableFieldDom(o)), e.push(i);
     }
     {
-      const i = te.createElement("block");
-      i.setAttribute("type", "variable_set_v1"), i.appendChild(Nt.generateVariableFieldDom(o)), e.push(i);
+      const i = ee.createElement("block");
+      i.setAttribute("type", "variable_set_v1"), i.appendChild(St.generateVariableFieldDom(o)), e.push(i);
     }
   }), e;
 }
-const _t = {
+const pt = {
   name: "VARIABLE_CATEGORY",
   callback: rc
 };
 function uc() {
   const t = [];
   if (nt().length > 0)
-    t.push(V(f("LABEL_OPERATION"))), t.push(v("add_data_v1")), t.push(v("delete_data_v1")), t.push(v("update_data_v1")), t.push(v("query_data_v1")), t.push(v("transaction_v1")), t.push(
-      v("interrupt_transaction_v1", [bt("VALUE")])
-    ), t.push(V(f("LABEL_CONDITION"))), t.push(v("cond_logic_v1")), t.push(v("cond_atomic_v1", [bt("VALUE")])), t.push(V(f("LABEL_QUERY_EXTRA"))), t.push(
-      v("query_extra_limit_v1", [
+    t.push(x(f("LABEL_OPERATION"))), t.push(y("add_data_v1")), t.push(y("delete_data_v1")), t.push(y("update_data_v1")), t.push(y("query_data_v1")), t.push(y("transaction_v1")), t.push(
+      y("interrupt_transaction_v1", [Rt("VALUE")])
+    ), t.push(x(f("LABEL_CONDITION"))), t.push(y("cond_logic_v1")), t.push(y("cond_atomic_v1", [Rt("VALUE")])), t.push(x(f("LABEL_QUERY_EXTRA"))), t.push(
+      y("query_extra_limit_v1", [
         bn("OFFSET", 0),
         bn("LIMIT", 1)
       ])
     ), t.push(
-      v("query_extra_sortby_v1", [
-        bt("COLUMN"),
+      y("query_extra_sortby_v1", [
+        Rt("COLUMN"),
         Xa("DESC")
       ])
     );
@@ -10073,25 +10112,25 @@ function uc() {
 }
 const me = { name: "COMPUTE_DATA_CATEGORY", callback: uc };
 function lc() {
-  return qt("flow").length > 0;
+  return Qt("flow").length > 0;
 }
 function _c() {
   const t = [];
-  return g.compute.activeObject.type === "flow" && t.push(v("on_flow_state_event_v1")), lc() && console.assert(!0), t;
+  return g.compute.activeObject.type === "flow" && t.push(y("on_flow_state_event_v1")), lc() && console.assert(!0), t;
 }
 const Te = { name: "COMPUTE_FLOW_CATEGORY", callback: _c };
 function pc() {
-  return qt("func").length > 0;
+  return Qt("func").length > 0;
 }
 function dc() {
   const t = [];
-  return g.compute.activeObject.type === "func" && (t.push(v("func_entry_v1")), g.compute.activeFunc.outputs.length > 0 && t.push(v("set_func_output_v1")), t.push(v("procedure_return_v1"))), pc() && t.push(v("call_func_internal_v1")), t;
+  return g.compute.activeObject.type === "func" && (t.push(y("func_entry_v1")), g.compute.activeFunc.outputs.length > 0 && t.push(y("set_func_output_v1")), t.push(y("procedure_return_v1"))), pc() && t.push(y("call_func_internal_v1")), t;
 }
 const Ee = { name: "COMPUTE_FUNC_CATEGORY", callback: dc };
 function hc() {
   const t = [];
   return t.push(
-    v("compute_debug_trace_v1", [bt("OBJECT")])
+    y("compute_debug_trace_v1", [Rt("OBJECT")])
   ), t;
 }
 const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
@@ -10830,13 +10869,13 @@ const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
       kind: "category",
       name: "%{BKY_CATEGORY_VARIABLE}",
       categorystyle: "variable_category",
-      custom: _t.name
+      custom: pt.name
     },
     {
       kind: "category",
       name: "%{BKY_CATEGORY_PROCEDURE}",
       categorystyle: "procedure_category",
-      custom: lt.name
+      custom: _t.name
     },
     {
       kind: "category",
@@ -10889,13 +10928,13 @@ const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
       kind: "category",
       name: "%{BKY_CATEGORY_VARIABLE}",
       categorystyle: "variable_category",
-      custom: _t.name
+      custom: pt.name
     },
     {
       kind: "category",
       name: "%{BKY_CATEGORY_PROCEDURE}",
       categorystyle: "procedure_category",
-      custom: lt.name
+      custom: _t.name
     }
   ]
 }, Tc = {
@@ -10936,13 +10975,13 @@ const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
       kind: "category",
       name: "%{BKY_CATEGORY_VARIABLE}",
       categorystyle: "variable_category",
-      custom: _t.name
+      custom: pt.name
     },
     {
       kind: "category",
       name: "%{BKY_CATEGORY_PROCEDURE}",
       categorystyle: "procedure_category",
-      custom: lt.name
+      custom: _t.name
     }
   ]
 }, Ec = {
@@ -11009,13 +11048,13 @@ const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
       kind: "category",
       name: "%{BKY_CATEGORY_VARIABLE}",
       categorystyle: "variable_category",
-      custom: _t.name
+      custom: pt.name
     },
     {
       kind: "category",
       name: "%{BKY_CATEGORY_PROCEDURE}",
       categorystyle: "procedure_category",
-      custom: lt.name
+      custom: _t.name
     },
     {
       kind: "category",
@@ -11059,7 +11098,7 @@ const ge = { name: "COMPUTE_MISC_CATEGORY", callback: hc }, Se = {
 function Ac(t, e, n, o) {
   He.theme = o ? "dark" : "light", He.toolbox = Ic(e, n);
   const i = Vo(t, He);
-  return i.addChangeListener(xo.shadowBlockConversionChangeListener), Oc(i, e, n), vc(i), i;
+  return i.addChangeListener(xo.shadowBlockConversionChangeListener), Oc(i, e, n), yc(i), i;
 }
 function Ic(t, e) {
   let n;
@@ -11069,10 +11108,10 @@ function Oc(t, e, n) {
   function o({ name: i, callback: a }) {
     t.registerToolboxCategoryCallback(i, () => a(e));
   }
-  e === "page" ? n === "v1" && (o(po), o(de), o(he), o(_t), o(lt), o(fe), o(pe)) : e === "comp" ? n === "v1" && (o(_o), o(de), o(he), o(_t), o(lt), o(fe), o(pe)) : e === "func" ? n === "v1" && (o(Ee), o(Te), o(me), o(ge), o(_t), o(lt)) : e === "flow" && n === "v1" && (o(Ee), o(Te), o(me), o(ge), o(_t), o(lt));
+  e === "page" ? n === "v1" && (o(po), o(de), o(he), o(pt), o(_t), o(fe), o(pe)) : e === "comp" ? n === "v1" && (o(_o), o(de), o(he), o(pt), o(_t), o(fe), o(pe)) : e === "func" ? n === "v1" && (o(Ee), o(Te), o(me), o(ge), o(pt), o(_t)) : e === "flow" && n === "v1" && (o(Ee), o(Te), o(me), o(ge), o(pt), o(_t));
 }
-function vc(t) {
-  const { router: e } = yt;
+function yc(t) {
+  const { router: e } = kt;
   t.registerButtonCallback("NO_COMPUTE", () => {
     const n = e.resolve({
       path: "/compute/" + Date.now()
@@ -11089,7 +11128,7 @@ function vc(t) {
     }, 100);
   });
 }
-function yc(t, e) {
+function vc(t, e) {
   const n = e.newBlock("json_root_v1");
   n.initSvg(), n.render();
   const o = (i, a) => {
@@ -11111,21 +11150,21 @@ function yc(t, e) {
       else
         return;
     }
-    const u = e.newBlock(c);
-    if (u.initSvg(), u.render(), a.connect(u.outputConnection), c === "json_map_v1") {
+    const r = e.newBlock(c);
+    if (r.initSvg(), r.render(), a.connect(r.outputConnection), c === "json_map_v1") {
       const l = [];
       for (const _ in i)
         l.push(_);
-      u.initData(l);
+      r.initData(l);
       for (let _ = 0; _ < l.length; _++) {
-        const d = l[_], h = u.getInput("ENTRY" + _);
+        const d = l[_], h = r.getInput("ENTRY" + _);
         o(i[d], h.connection);
       }
     } else if (c === "json_array_v1") {
-      u.initData(i.length);
+      r.initData(i.length);
       for (let l = 0; l < i.length; l++)
-        o(i[l], u.getInput("ENTRY" + l).connection);
-    } else c === "json_string_v1" || c === "json_number_v1" ? u.setFieldValue(i, "VALUE") : c === "json_boolean_v1" && u.setFieldValue(i ? "true" : "false", "VALUE");
+        o(i[l], r.getInput("ENTRY" + l).connection);
+    } else c === "json_string_v1" || c === "json_number_v1" ? r.setFieldValue(i, "VALUE") : c === "json_boolean_v1" && r.setFieldValue(i ? "true" : "false", "VALUE");
   };
   o(t, n.getInput("JSON").connection), I.fire(
     new (I.get(I.FINISHED_LOADING))(e)
@@ -11163,7 +11202,7 @@ function Cc(t) {
     if (o.type === "json_root_v1")
       return e(o);
 }
-const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
+const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ rt({
   __name: "index",
   props: /* @__PURE__ */ je({
     type: {},
@@ -11178,18 +11217,18 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
   }),
   emits: /* @__PURE__ */ je(["ready"], ["update:lock", "update:scale"]),
   setup(t, { expose: e, emit: n }) {
-    const { backgroundColor2: o } = jt(), i = Kt(t, "lock"), a = Kt(t, "scale"), c = n, u = `blocklyEditor${Xe()}`, l = Lt(), _ = wt("parentContainer"), d = wt("clean"), h = wt("navigator"), p = {};
+    const { backgroundColor2: o } = Xt(), i = $t(t, "lock"), a = $t(t, "scale"), c = n, r = `blocklyEditor${Xe()}`, l = Bt(), _ = Kt("parentContainer"), d = Kt("clean"), h = Kt("navigator"), p = {};
     Da(p);
-    const m = Lt(!0), A = Lt(!1), R = F(() => t.type === "json" ? "tree" : "list"), P = F(() => ({
+    const m = Bt(!0), A = Bt(!1), R = w(() => t.type === "json" ? "tree" : "list"), P = w(() => ({
       width: "100%",
       height: "calc(100% - 48px)"
-    })), At = F(() => ({
+    })), It = w(() => ({
       position: "absolute",
       background: o.value,
       bottom: "0px",
       width: "100%",
       height: "48px"
-    })), G = F(() => ({
+    })), G = w(() => ({
       position: "absolute",
       background: t.dark ? "#0000007f" : "#ffffff7f",
       top: "1px",
@@ -11197,12 +11236,12 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       width: "56px",
       height: "calc(100% - 49px)",
       zIndex: 999
-    })), Ct = F(() => ({
+    })), Nt = w(() => ({
       position: "absolute",
       top: "0px",
       right: "0px",
       zIndex: 20
-    })), W = F(() => ({
+    })), W = w(() => ({
       position: "absolute",
       background: t.dark ? "#0000007f" : "#ffffff7f",
       top: "0px",
@@ -11210,7 +11249,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       width: "100%",
       height: "calc(100% - 48px)",
       pointerEvents: "none"
-    })), _n = F(() => ({
+    })), _n = w(() => ({
       position: "absolute",
       background: t.dark ? "#0000007f" : "#ffffff7f",
       top: "1px",
@@ -11218,7 +11257,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       width: "56px",
       height: "calc(100% - 49px)",
       zIndex: 999
-    })), fo = F(() => ({
+    })), fo = w(() => ({
       position: "fixed",
       top: 0,
       left: 0,
@@ -11230,10 +11269,10 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
         return;
       }
       Yo(_.value), await In(t.locale), p.workspace = Ac(l.value, t.type, t.version, t.dark), p.workspace.addChangeListener(I.disableOrphans), p.workspace.addChangeListener(mo);
-      const N = document.querySelector(`#${u} .blocklyFlyout`);
+      const N = document.querySelector(`#${r} .blocklyFlyout`);
       new MutationObserver((Ue) => {
-        Ue.forEach((zt) => {
-          zt.type === "attributes" && zt.attributeName === "style" && (Ut.value = p.workspace.getFlyout().isVisible());
+        Ue.forEach((Zt) => {
+          Zt.type === "attributes" && Zt.attributeName === "style" && (Ut.value = p.workspace.getFlyout().isVisible());
         });
       }).observe(N, { attributes: !0 }), Ut.value = p.workspace.getFlyout().isVisible(), pn(), dn(), await ni(), c("ready");
     }), An(() => {
@@ -11259,7 +11298,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       }
     }
     const To = (N) => {
-      m.value = !0, t.type === "json" ? yc(N, p.workspace) : $.workspaces.load(N, p.workspace);
+      m.value = !0, t.type === "json" ? vc(N, p.workspace) : $.workspaces.load(N, p.workspace);
     }, Eo = () => t.type === "json" ? Cc(p.workspace) : $.workspaces.save(p.workspace), go = () => {
       if (t.type === "json")
         console.assert(!1);
@@ -11279,9 +11318,9 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       h.value && (h.value.open = !0);
     };
     return gn(() => {
-      kt.on("cleanWorkspace", hn), kt.on("toggleBlocklyLock", fn), kt.on("openBlocklyNavigator", mn);
+      Lt.on("cleanWorkspace", hn), Lt.on("toggleBlocklyLock", fn), Lt.on("openBlocklyNavigator", mn);
     }), An(() => {
-      kt.off("cleanWorkspace", hn), kt.off("toggleBlocklyLock", fn), kt.off("openBlocklyNavigator", mn);
+      Lt.off("cleanWorkspace", hn), Lt.off("toggleBlocklyLock", fn), Lt.off("openBlocklyNavigator", mn);
     }), Vt(
       () => t.locale,
       (N) => {
@@ -11305,17 +11344,17 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       generateCode: go,
       generateReactivity: Ao,
       fireStateChange: Io
-    }), (N, It) => {
-      const Ue = M("v-icon"), zt = M("x-loading");
+    }), (N, Ot) => {
+      const Ue = M("v-icon"), Zt = M("x-loading");
       return S(), tt("div", kc, [
-        w("div", {
-          id: u,
+        K("div", {
+          id: r,
           ref_key: "blocklyDiv",
           ref: l,
           style: j(P.value)
         }, null, 4),
-        w("div", {
-          style: j(At.value)
+        K("div", {
+          style: j(It.value)
         }, [
           oi(N.$slots, "bottom")
         ], 4),
@@ -11328,11 +11367,11 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
             icon: "mdi-delete",
             size: "x-large"
           })
-        ], 4)) : rt("", !0),
-        m.value ? rt("", !0) : (S(), tt("div", {
+        ], 4)) : ut("", !0),
+        m.value ? ut("", !0) : (S(), tt("div", {
           key: 1,
           class: "d-flex align-end ga-3 pt-3 pr-3",
-          style: j(Ct.value)
+          style: j(Nt.value)
         }, [
           L(Ma, {
             ref_key: "clean",
@@ -11341,7 +11380,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
           }, null, 8, ["lock"]),
           L(Ua, {
             modelValue: i.value,
-            "onUpdate:modelValue": It[0] || (It[0] = (Oo) => i.value = Oo)
+            "onUpdate:modelValue": Ot[0] || (Ot[0] = (Oo) => i.value = Oo)
           }, null, 8, ["modelValue"]),
           L(ja, {
             ref_key: "navigator",
@@ -11353,24 +11392,24 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
         i.value ? (S(), tt("div", {
           key: 2,
           style: j(_n.value)
-        }, null, 4)) : rt("", !0),
+        }, null, 4)) : ut("", !0),
         i.value ? (S(), tt("div", {
           key: 3,
           style: j(W.value)
-        }, null, 4)) : rt("", !0),
-        w("div", {
+        }, null, 4)) : ut("", !0),
+        K("div", {
           ref_key: "parentContainer",
           ref: _,
           style: j(fo.value)
         }, null, 4),
-        L(zt, {
+        L(Zt, {
           open: m.value,
           "z-index": 99
         }, null, 8, ["open"])
       ]);
     };
   }
-}), Lc = /* @__PURE__ */ ct({
+}), Lc = /* @__PURE__ */ rt({
   __name: "index",
   props: {
     code: {}
@@ -11378,7 +11417,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
   setup(t) {
     const e = t;
     Ko.registerLanguage("javascript", $o);
-    const n = Ho.component, { backgroundColor2: o } = jt();
+    const n = Ho.component, { backgroundColor2: o } = Xt();
     return (i, a) => {
       const c = M("v-sheet");
       return S(), st(c, {
@@ -11396,18 +11435,18 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
       }, 8, ["color"]);
     };
   }
-}), Sc = { class: "text-subtitle-1" }, Bc = { class: "w-100 h-100 overflow-auto" }, bc = /* @__PURE__ */ ct({
+}), Sc = { class: "text-subtitle-1" }, Bc = { class: "w-100 h-100 overflow-auto" }, bc = /* @__PURE__ */ rt({
   __name: "index",
   setup(t) {
-    const { t: e } = Xt(), { sysBarAvail: n } = Yn(), { backgroundColor0: o, backgroundColor2: i } = jt(), a = Lt(""), c = F(() => {
+    const { t: e } = Jt(), { sysBarAvail: n } = Yn(), { backgroundColor0: o, backgroundColor2: i } = Xt(), a = Bt(""), c = w(() => {
       let _ = 48;
       return n.value && (_ += 24), {
         position: "relative",
         height: `calc(100% - ${_}px)`
       };
-    }), u = (_) => {
+    }), r = (_) => {
       a.value = _.code;
-    }, { open: l } = nn("sourceDlg", u);
+    }, { open: l } = nn("sourceDlg", r);
     return (_, d) => {
       const h = M("v-sheet"), p = M("v-btn"), m = M("v-spacer"), A = M("v-dialog");
       return S(), st(A, {
@@ -11417,7 +11456,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
         "no-click-animation": "",
         persistent: "",
         transition: "dialog-bottom-transition",
-        onKeydown: d[2] || (d[2] = $n(Ft((R) => l.value = !1, ["stop", "prevent"]), ["esc"]))
+        onKeydown: d[2] || (d[2] = $n(wt((R) => l.value = !1, ["stop", "prevent"]), ["esc"]))
       }, {
         default: at(() => [
           L(h, {
@@ -11430,7 +11469,7 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
                 key: 0,
                 color: D(i),
                 height: 24
-              }, null, 8, ["color"])) : rt("", !0),
+              }, null, 8, ["color"])) : ut("", !0),
               L(h, {
                 class: "d-flex align-center px-2",
                 color: D(i),
@@ -11443,15 +11482,15 @@ const kc = { class: "position-relative w-100 h-100" }, Nc = /* @__PURE__ */ ct({
                     variant: "text",
                     onClick: d[0] || (d[0] = (R) => l.value = !1)
                   }),
-                  w("span", Sc, $t(D(e)("x-block-lib.dlg.source.title")), 1),
+                  K("span", Sc, Ht(D(e)("x-block-lib.dlg.source.title")), 1),
                   L(m)
                 ]),
                 _: 1
               }, 8, ["color"]),
-              w("div", {
+              K("div", {
                 style: j(c.value)
               }, [
-                w("div", Bc, [
+                K("div", Bc, [
                   L(Lc, { code: a.value }, null, 8, ["code"])
                 ])
               ], 4)