x-block-lib 0.8.63 → 0.8.65

package/dist/index.js

@@ -1,5 +1,5 @@
 (function(){"use strict";try{if(typeof document<"u"){var l=document.createElement("style");l.id="x-block-lib",l.appendChild(document.createTextNode("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-a77ed323]{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(o){console.error("vite-plugin-css-injected-by-js",o)}})();
-import { E as O, r as On, M as Mo, s as Uo, a as Vo, X as $n, u as N, B as A, j as i, O as _, F as v, b as je, i as S, c as It, d as xo, e as w, f as g, g as Yo, h as J, k as Et, p as wt, l as ct, m as vn, n as U, C as Hn, N as rt, o as Fo, P as Xe, q as Ye, V as bt, t as Gn, W as wo, v as Ko, w as $o, S as Ho, x as Go, y as Wo, z as Xt, T as ye, A as Wn, D as jo, G as Xo, H as jn, I as Jo, J as qo, K as Qo, L as zo, Q as Zo, R as ts, U as es, Y as ns } from "./vendor.je7mkgas.js";
+import { E as O, r as On, M as Mo, s as Uo, a as Vo, X as $n, u as N, B as A, j as i, O as u, F as v, b as je, i as S, c as It, d as xo, e as w, f as g, g as Yo, h as J, k as Et, p as wt, l as ct, m as vn, n as U, C as Hn, N as rt, o as Fo, P as Xe, q as Ye, V as bt, t as Gn, W as wo, v as Ko, w as $o, S as Ho, x as Go, y as Wo, z as Xt, T as ye, A as Wn, D as jo, G as Xo, H as jn, I as Jo, J as qo, K as Qo, L as zo, Q as Zo, R as ts, U as es, Y as ns } from "./vendor.k8hjxofe.js";
 import { globalState as I } from "x-state-lib";
 import { globalObjects as yt, openConfirmDlg as os, openPromptDlg as ss, messageWarning as Xn, useColor as Jt, useSystem as Jn, useViewStack as rn, eventBus as Bt } from "x-essential-lib";
 import { pkgs as ie, parsePixelStr as is, parsePercentStr as as, getPropertyTag as Vt, unwrapEventId as un, elements as V, unwrapEventKeyOfCustomSlot as Cn, unwrapEventKeyOfElementSlot as cs, unwrapPropertyKeyOfCustomSlot as Je, unwrapPropertyKeyOfElementSlot as qn, makeEventId as K, makeEventKeyOfCustomSlot as kn, unwrapSlotId as ae, makeEventKeyOfElementSlot as rs, makePropertyKeyOfCustomSlot as qe, makePropertyKeyOfElementSlot as Qn, toEventName as Oe, unwrapMethodId as qt, unwrapMethodKeyOfCustomSlot as Qe, unwrapMethodKeyOfElementSlot as us, makeMethodId as _t, makeMethodKeyOfCustomSlot as Sn, makeMethodKeyOfElementSlot as ls, toMethodName as ve, unwrapPropertyId as _s, makePropertyId as kt, toPropertyName as zn, isLocaleOfMethodKind as Zn, makeTriggerId as St } from "x-runtime-lib";
@@ -108,19 +108,19 @@ function j(t, e) {
       const [o, s, a, r] = n, c = t.getInput(o)?.connection;
       if (!c)
         return;
-      let l = c.targetBlock();
-      if (l) {
-        const d = l;
+      let _ = c.targetBlock();
+      if (_) {
+        const d = _;
         if (d && d.key === s && d.name === a && d.locale === r)
           return;
-        l.dispose();
+        _.dispose();
       }
-      l = pn(
+      _ = pn(
         t.workspace,
         s,
         a,
         r
-      ), l.outputConnection.connect(c);
+      ), _.outputConnection.connect(c);
     });
   } finally {
     O.enable();
@@ -256,7 +256,7 @@ const Rs = {
 A.get_page_argument_v1 = Rs;
 i.forBlock.get_page_argument_v1 = function(t) {
   const e = t;
-  return [`__getPageArgumentV1__(${i.quote_(e.argument.key)})`, _.FUNCTION_CALL];
+  return [`__getPageArgumentV1__(${i.quote_(e.argument.key)})`, u.FUNCTION_CALL];
 };
 const Ds = (t, e) => {
   const n = Ce(t), o = re(t);
@@ -275,7 +275,7 @@ const Ds = (t, e) => {
     }
   }, i.forBlock[n] = function(s) {
     const a = i.quote_, r = s.getFieldValue("ITEM");
-    return [a(r), _.ATOMIC];
+    return [a(r), u.ATOMIC];
   };
 };
 for (const t in ie) {
@@ -334,7 +334,7 @@ const Ms = (t, e) => {
       if (!r)
         return;
       s.removeField("VALUE", !0), s.removeField("SUFFIX", !0);
-      let c, l;
+      let c, _;
       if (r.ui === "pixelInput") {
         const d = is(this.value) ?? 0;
         c = new je(
@@ -342,10 +342,10 @@ const Ms = (t, e) => {
           r.min,
           r.max,
           r.precision ? 1 / Math.pow(10, r.precision) : null,
-          (u) => {
-            this.value = u + "px";
+          (l) => {
+            this.value = l + "px";
           }
-        ), l = "px";
+        ), _ = "px";
       } else if (r.ui === "percentInput") {
         const d = as(this.value) ?? 0;
         c = new je(
@@ -353,12 +353,12 @@ const Ms = (t, e) => {
           r.min,
           r.max,
           r.precision ? 1 / Math.pow(10, r.precision) : null,
-          (u) => {
-            this.value = u + "%";
+          (l) => {
+            this.value = l + "%";
           }
-        ), l = "%";
+        ), _ = "%";
       }
-      c && s.appendField(c, "VALUE"), l && s.appendField(l, "SUFFIX");
+      c && s.appendField(c, "VALUE"), _ && s.appendField(_, "SUFFIX");
     },
     checkWarning_: function() {
       let s = this.value;
@@ -370,7 +370,7 @@ const Ms = (t, e) => {
     }
   }, i.forBlock[n] = function(s) {
     const a = i.quote_;
-    return [a(s.value), _.ATOMIC];
+    return [a(s.value), u.ATOMIC];
   };
 };
 for (const t in ie) {
@@ -534,31 +534,6 @@ function Fs() {
     t.push([o, n]);
   }), B(t);
 }
-function en(t) {
-  const { appList: e } = I.app, n = [], o = e.find((s) => s.id === t);
-  if (!o)
-    return n;
-  for (const { id: s, name: a } of o.pages)
-    n.push({ id: s, name: a });
-  return n;
-}
-function we(t, e) {
-  const { appList: n } = I.app, o = n.find((a) => a.id === t);
-  if (!o)
-    return;
-  const s = o.pages.find((a) => a.id === e);
-  if (s)
-    return {
-      id: s.id,
-      name: s.name
-    };
-}
-function ws(t) {
-  const e = [];
-  return en(t).forEach(({ id: o, name: s }) => {
-    e.push([s, o]);
-  }), B(e);
-}
 function ro() {
   const { activeApp: t } = I.app, e = [{ id: "", name: "" }];
   for (const { id: n, name: o } of t.comps)
@@ -576,7 +551,7 @@ function Dn(t) {
       name: n.name
     };
 }
-function Ks() {
+function ws() {
   const { i18n: t } = yt, e = [];
   return ro().forEach(({ id: o, name: s }) => {
     let a = s;
@@ -597,28 +572,28 @@ function x(t) {
     { key: "oldValue", name: "x-runtime-lib.oldValue", type: t }
   ];
 }
-function nn(t) {
+function en(t) {
   const { properties: e } = I.runtime, { activeObject: n, activePage: o, activeComp: s, depends: a } = I.app, r = [], c = Vt(n.type, n.subtype);
   if (!c)
     return r;
-  const l = n.nodes.find((u) => u.id === t);
-  if (!l)
+  const _ = n.nodes.find((l) => l.id === t);
+  if (!_)
     return r;
-  const d = V[l.key];
+  const d = V[_.key];
   if (!d)
-    return console.assert(!1, "invalid element", l.key), r;
+    return console.assert(!1, "invalid element", _.key), r;
   if (d.events)
-    for (const { key: u, name: h, params: p } of d.events)
+    for (const { key: l, name: h, params: p } of d.events)
       r.push({
-        id: K("elementEvent", t, u),
+        id: K("elementEvent", t, l),
         kind: "elementEvent",
         names: [h],
         params: p
       });
-  if (et(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.events)
-      for (const { id: h, name: p, params: f } of u.meta.events)
+  if (et(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.events)
+      for (const { id: h, name: p, params: f } of l.meta.events)
         r.push({
           id: K("refEvent", t, h),
           kind: "refEvent",
@@ -626,10 +601,10 @@ function nn(t) {
           params: ot(f)
         });
   }
-  if (nt(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.events)
-      for (const { id: h, name: p, params: f } of u.meta.events)
+  if (nt(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.events)
+      for (const { id: h, name: p, params: f } of l.meta.events)
         r.push({
           id: K("multipleRefEvent", t, h),
           kind: "multipleRefEvent",
@@ -638,36 +613,36 @@ function nn(t) {
         });
   }
   if (L(d.key) && n.type === "comp" && s.meta.events)
-    for (const { id: u, name: h, params: p } of s.meta.events)
+    for (const { id: l, name: h, params: p } of s.meta.events)
       r.push({
-        id: K("customEvent", t, u),
+        id: K("customEvent", t, l),
         kind: "customEvent",
         names: [h],
         params: ot(p)
       });
   if (L(d.key) && n.type === "comp" && s.meta.slots) {
-    for (const u of s.meta.slots)
-      if (u.events)
-        for (const h of u.events)
+    for (const l of s.meta.slots)
+      if (l.events)
+        for (const h of l.events)
           r.push({
             id: K(
               "cusotmSlotEvent",
               t,
-              kn("", u.id, h.id)
+              kn("", l.id, h.id)
             ),
             kind: "customSlotEvent",
-            names: [u.name, h.name],
+            names: [l.name, h.name],
             params: ot(h.params)
           });
   }
-  if (L(d.key) && n.type === "comp" && l.settings && l.settings.adaptSlot) {
-    const u = ae(l.settings.adaptSlot);
-    if (u) {
-      if (u.kind === "elementSlot") {
-        const h = V[u.mainKey];
+  if (L(d.key) && n.type === "comp" && _.adaptSlot) {
+    const l = ae(_.adaptSlot);
+    if (l) {
+      if (l.kind === "elementSlot") {
+        const h = V[l.mainKey];
         if (h && h.slots) {
           const p = h.slots.find(
-            (f) => f.key === u.slotKey
+            (f) => f.key === l.slotKey
           );
           if (p && p.events)
             for (const f of p.events)
@@ -676,8 +651,8 @@ function nn(t) {
                   "adaptSlotElementEvent",
                   t,
                   rs(
-                    u.mainKey,
-                    u.slotKey,
+                    l.mainKey,
+                    l.slotKey,
                     f.key
                   )
                 ),
@@ -686,11 +661,11 @@ function nn(t) {
                 params: f.params
               });
         }
-      } else if (u.kind === "customSlot") {
-        const h = a[u.mainKey];
+      } else if (l.kind === "customSlot") {
+        const h = a[l.mainKey];
         if (h && h.meta.slots) {
           const p = h.meta.slots.find(
-            (f) => f.id === u.slotKey
+            (f) => f.id === l.slotKey
           );
           if (p && p.events)
             for (const f of p.events)
@@ -698,7 +673,7 @@ function nn(t) {
                 id: K(
                   "adaptSlotCustomEvent",
                   t,
-                  kn(u.mainKey, p.id, f.id)
+                  kn(l.mainKey, p.id, f.id)
                 ),
                 kind: "adaptSlotCustomEvent",
                 names: [h.name, p.name, f.name],
@@ -709,17 +684,17 @@ function nn(t) {
     }
   }
   if (e[d.key] && e[d.key][c])
-    for (const { keys: u, names: h, raw: p } of e[d.key][c])
-      ke(u, p) || r.push({
-        id: K("elementPropertyChangeEvent", t, u),
+    for (const { keys: l, names: h, raw: p } of e[d.key][c])
+      ke(l, p) || r.push({
+        id: K("elementPropertyChangeEvent", t, l),
         kind: "elementPropertyChangeEvent",
         names: h,
         params: x(so(p))
       });
-  if (et(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.properties)
-      for (const { id: h, name: p, type: f } of u.meta.properties)
+  if (et(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.properties)
+      for (const { id: h, name: p, type: f } of l.meta.properties)
         r.push({
           id: K("refPropertyChangeEvent", t, h),
           kind: "refPropertyChangeEvent",
@@ -727,10 +702,10 @@ function nn(t) {
           params: x(f)
         });
   }
-  if (nt(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.properties)
-      for (const { id: h, name: p, type: f } of u.meta.properties)
+  if (nt(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.properties)
+      for (const { id: h, name: p, type: f } of l.meta.properties)
         r.push({
           id: K("multipleRefPropertyChangeEvent", t, h),
           kind: "multipleRefPropertyChangeEvent",
@@ -739,36 +714,36 @@ function nn(t) {
         });
   }
   if (L(d.key) && n.type === "comp" && s.meta.properties)
-    for (const { id: u, name: h, type: p } of s.meta.properties)
+    for (const { id: l, name: h, type: p } of s.meta.properties)
       r.push({
-        id: K("customPropertyChangeEvent", t, u),
+        id: K("customPropertyChangeEvent", t, l),
         kind: "customPropertyChangeEvent",
         names: [h],
         params: x(p)
       });
   if (L(d.key) && n.type === "comp" && s.meta.slots) {
-    for (const u of s.meta.slots)
-      if (u.properties)
-        for (const h of u.properties)
+    for (const l of s.meta.slots)
+      if (l.properties)
+        for (const h of l.properties)
           r.push({
             id: K(
               "customSlotPropertyChangeEvent",
               t,
-              qe("", u.id, h.id)
+              qe("", l.id, h.id)
             ),
             kind: "customSlotPropertyChangeEvent",
-            names: [u.name, h.name],
+            names: [l.name, h.name],
             params: x(h.type)
           });
   }
-  if (L(d.key) && n.type === "comp" && l.settings && l.settings.adaptSlot) {
-    const u = ae(l.settings.adaptSlot);
-    if (u) {
-      if (u.kind === "elementSlot") {
-        const h = V[u.mainKey];
+  if (L(d.key) && n.type === "comp" && _.adaptSlot) {
+    const l = ae(_.adaptSlot);
+    if (l) {
+      if (l.kind === "elementSlot") {
+        const h = V[l.mainKey];
         if (h && h.slots) {
           const p = h.slots.find(
-            (f) => f.key === u.slotKey
+            (f) => f.key === l.slotKey
           );
           if (p && p.properties)
             for (const f of p.properties)
@@ -787,11 +762,11 @@ function nn(t) {
                 params: x(f.type)
               });
         }
-      } else if (u.kind === "customSlot") {
-        const h = a[u.mainKey];
+      } else if (l.kind === "customSlot") {
+        const h = a[l.mainKey];
         if (h && h.meta.slots) {
           const p = h.meta.slots.find(
-            (f) => f.id === u.slotKey
+            (f) => f.id === l.slotKey
           );
           if (p && p.properties)
             for (const f of p.properties)
@@ -800,7 +775,7 @@ function nn(t) {
                   "adaptSlotCustomPropertyChangeEvent",
                   t,
                   qe(
-                    u.mainKey,
+                    l.mainKey,
                     p.id,
                     f.id
                   )
@@ -816,17 +791,17 @@ function nn(t) {
   if (L(d.key)) {
     if (n.type === "page") {
       if (o.meta.states)
-        for (const { id: u, name: h, type: p } of o.meta.states)
+        for (const { id: l, name: h, type: p } of o.meta.states)
           r.push({
-            id: K("stateChangeEvent", "globality", u),
+            id: K("stateChangeEvent", "globality", l),
             kind: "stateChangeEvent",
             names: [h],
             params: x(p)
           });
     } else if (n.type === "comp" && s.meta.states)
-      for (const { id: u, name: h, type: p } of s.meta.states)
+      for (const { id: l, name: h, type: p } of s.meta.states)
         r.push({
-          id: K("stateChangeEvent", "globality", u),
+          id: K("stateChangeEvent", "globality", l),
           kind: "stateChangeEvent",
           names: [h],
           params: x(p)
@@ -834,18 +809,18 @@ function nn(t) {
   }
   return r;
 }
-function Ke(t) {
+function we(t) {
   if (!t)
     return;
   const { properties: e } = I.runtime, { activeObject: n, activePage: o, activeComp: s, depends: a } = I.app, r = Vt(n.type, n.subtype);
   if (!r)
     return;
-  const { kind: c, nodeId: l, eventKey: d } = un(t), u = n.nodes.find((p) => p.id === l);
-  if (!u)
+  const { kind: c, nodeId: _, eventKey: d } = un(t), l = n.nodes.find((p) => p.id === _);
+  if (!l)
     return;
-  const h = V[u.key];
+  const h = V[l.key];
   if (!h) {
-    console.assert(!1, "invalid element", u.key);
+    console.assert(!1, "invalid element", l.key);
     return;
   }
   if (c === "elementEvent") {
@@ -858,8 +833,8 @@ function Ke(t) {
         params: p.params
       };
   } else if (c === "referenceEvent") {
-    if (et(h.key) && u.settings && u.settings.comp) {
-      const p = a[u.settings.comp];
+    if (et(h.key) && l.comp) {
+      const p = a[l.comp];
       if (p) {
         const f = p.meta.events?.find((T) => T.id === d);
         if (f)
@@ -872,8 +847,8 @@ function Ke(t) {
       }
     }
   } else if (c === "multipleRefEvent") {
-    if (nt(h.key) && u.settings && u.settings.comp) {
-      const p = a[u.settings.comp];
+    if (nt(h.key) && l.comp) {
+      const p = a[l.comp];
       if (p) {
         const f = p.meta.events?.find((T) => T.id === d);
         if (f)
@@ -962,8 +937,8 @@ function Ke(t) {
         };
     }
   } else if (c === "referencePropertyChangeEvent") {
-    if (et(h.key) && u.settings && u.settings.comp) {
-      const p = a[u.settings.comp];
+    if (et(h.key) && l.comp) {
+      const p = a[l.comp];
       if (p) {
         const f = p.meta.properties?.find(
           (T) => T.id === d
@@ -978,8 +953,8 @@ function Ke(t) {
       }
     }
   } else if (c === "multipleRefPropertyChangeEvent") {
-    if (nt(h.key) && u.settings && u.settings.comp) {
-      const p = a[u.settings.comp];
+    if (nt(h.key) && l.comp) {
+      const p = a[l.comp];
       if (p) {
         const f = p.meta.properties?.find(
           (T) => T.id === d
@@ -1080,8 +1055,8 @@ function Ke(t) {
     }
   }
 }
-function $s(t) {
-  const e = [], n = nn(t);
+function Ks(t) {
+  const e = [], n = en(t);
   for (const { id: o, kind: s, names: a } of n)
     e.push([Oe(s, a), o]);
   return B(e);
@@ -1115,7 +1090,7 @@ function Mn(t) {
       };
   }
 }
-function Hs() {
+function $s() {
   const t = [], e = uo();
   for (const { id: n, kind: o, names: s } of e)
     t.push([Oe(o, s), n]);
@@ -1137,7 +1112,7 @@ function tt(t) {
     e.push({ key: n, name: o, type: s });
   return e;
 }
-function on(t) {
+function nn(t) {
   const { activeObject: e, activeComp: n, depends: o } = I.app, s = [], a = e.nodes.find((c) => c.id === t);
   if (!a)
     return s;
@@ -1145,94 +1120,94 @@ function on(t) {
   if (!r)
     return console.assert(!1, "inavlid element", a.key), s;
   if (r.methods)
-    for (const { key: c, name: l, inputs: d, outputs: u } of r.methods)
+    for (const { key: c, name: _, inputs: d, outputs: l } of r.methods)
       s.push({
         id: _t("elementMethod", t, c),
         kind: "elementMethod",
-        names: [l],
+        names: [_],
         inputs: d,
-        outputs: u
+        outputs: l
       });
-  if (et(r.key) && a.settings && a.settings.comp) {
-    const c = o[a.settings.comp];
+  if (et(r.key) && a.comp) {
+    const c = o[a.comp];
     if (c && c.meta.methods)
-      for (const { id: l, name: d, inputs: u, outputs: h } of c.meta.methods)
+      for (const { id: _, name: d, inputs: l, outputs: h } of c.meta.methods)
         s.push({
-          id: _t("refMethod", t, l),
+          id: _t("refMethod", t, _),
           kind: "refMethod",
           names: [d],
-          inputs: H(u),
+          inputs: H(l),
           outputs: tt(h)
         });
   }
-  if (nt(r.key) && a.settings && a.settings.comp) {
-    const c = o[a.settings.comp];
+  if (nt(r.key) && a.comp) {
+    const c = o[a.comp];
     if (c && c.meta.methods)
-      for (const { id: l, name: d, inputs: u, outputs: h } of c.meta.methods)
+      for (const { id: _, name: d, inputs: l, outputs: h } of c.meta.methods)
         s.push({
-          id: _t("multipleRefMethod", t, l),
+          id: _t("multipleRefMethod", t, _),
           kind: "multipleRefMethod",
           names: [d],
-          inputs: H(u),
+          inputs: H(l),
           outputs: tt(h)
         });
   }
   if (L(r.key) && e.type === "comp" && n.meta.methods)
-    for (const { id: c, name: l, inputs: d, outputs: u } of n.meta.methods)
+    for (const { id: c, name: _, inputs: d, outputs: l } of n.meta.methods)
       s.push({
         id: _t("customMethod", t, c),
         kind: "customMethod",
-        names: [l],
+        names: [_],
         inputs: H(d),
-        outputs: tt(u)
+        outputs: tt(l)
       });
   if (L(r.key) && e.type === "comp" && n.meta.slots) {
     for (const c of n.meta.slots)
       if (c.methods)
-        for (const l of c.methods)
+        for (const _ of c.methods)
           s.push({
             id: _t(
               "customSlotMethod",
               t,
-              Sn("", c.id, l.id)
+              Sn("", c.id, _.id)
             ),
             kind: "customSlotMethod",
-            names: [c.name, l.name],
-            inputs: H(l.inputs),
-            outputs: tt(l.outputs)
+            names: [c.name, _.name],
+            inputs: H(_.inputs),
+            outputs: tt(_.outputs)
           });
   }
-  if (L(r.key) && e.type === "comp" && a.settings && a.settings.adaptSlot) {
-    const c = ae(a.settings.adaptSlot);
+  if (L(r.key) && e.type === "comp" && a.adaptSlot) {
+    const c = ae(a.adaptSlot);
     if (c) {
       if (c.kind === "elementSlot") {
-        const l = V[c.mainKey];
-        if (l && l.slots) {
-          const d = l.slots.find(
-            (u) => u.key === c.slotKey
+        const _ = V[c.mainKey];
+        if (_ && _.slots) {
+          const d = _.slots.find(
+            (l) => l.key === c.slotKey
           );
           if (d && d.methods)
-            for (const u of d.methods)
+            for (const l of d.methods)
               s.push({
                 id: _t(
                   "adaptSlotElementMethod",
                   t,
-                  ls(l.key, d.key, u.key)
+                  ls(_.key, d.key, l.key)
                 ),
                 kind: "adaptSlotElementMethod",
-                names: [l.name, d.name, u.name],
-                inputs: u.inputs,
-                outputs: u.outputs
+                names: [_.name, d.name, l.name],
+                inputs: l.inputs,
+                outputs: l.outputs
               });
         }
       } else if (c.kind === "customSlot") {
-        const l = o[c.mainKey];
-        if (l && l.meta.slots) {
-          const d = l.meta.slots.find(
-            (u) => u.id === c.slotKey
+        const _ = o[c.mainKey];
+        if (_ && _.meta.slots) {
+          const d = _.meta.slots.find(
+            (l) => l.id === c.slotKey
           );
           if (d && d.methods)
-            for (const u of d.methods)
+            for (const l of d.methods)
               s.push({
                 id: _t(
                   "adaptSlotCustomMethod",
@@ -1240,13 +1215,13 @@ function on(t) {
                   Sn(
                     c.mainKey,
                     d.id,
-                    u.id
+                    l.id
                   )
                 ),
                 kind: "adaptSlotCustomMethod",
-                names: [l.name, d.name, u.name],
-                inputs: H(u.inputs),
-                outputs: tt(u.outputs)
+                names: [_.name, d.name, l.name],
+                inputs: H(l.inputs),
+                outputs: tt(l.outputs)
               });
         }
       }
@@ -1254,19 +1229,19 @@ function on(t) {
   }
   return s;
 }
-function $e(t) {
+function Ke(t) {
   if (!t)
     return;
   const { activeObject: e, activeComp: n, depends: o } = I.app, { kind: s, nodeId: a, methodKey: r } = qt(t), c = e.nodes.find((d) => d.id === a);
   if (!c)
     return;
-  const l = V[c.key];
-  if (!l) {
+  const _ = V[c.key];
+  if (!_) {
     console.assert(!1, "invalid element", c.key);
     return;
   }
   if (s === "elementMethod") {
-    const d = l.methods?.find((u) => u.key === r);
+    const d = _.methods?.find((l) => l.key === r);
     if (d)
       return {
         id: t,
@@ -1276,43 +1251,43 @@ function $e(t) {
         outputs: d.outputs
       };
   } else if (s === "referenceMethod") {
-    if (et(l.key) && c.settings && c.settings.comp) {
-      const d = o[c.settings.comp];
+    if (et(_.key) && c.comp) {
+      const d = o[c.comp];
       if (d) {
-        const u = d.meta.methods?.find(
+        const l = d.meta.methods?.find(
           (h) => h.id === r
         );
-        if (u)
+        if (l)
           return {
             id: t,
             kind: s,
-            names: [u.name],
-            inputs: H(u.inputs),
-            outputs: tt(u.outputs)
+            names: [l.name],
+            inputs: H(l.inputs),
+            outputs: tt(l.outputs)
           };
       }
     }
   } else if (s === "multipleRefMethod") {
-    if (nt(l.key) && c.settings && c.settings.comp) {
-      const d = o[c.settings.comp];
+    if (nt(_.key) && c.comp) {
+      const d = o[c.comp];
       if (d) {
-        const u = d.meta.methods?.find(
+        const l = d.meta.methods?.find(
           (h) => h.id === r
         );
-        if (u)
+        if (l)
           return {
             id: t,
             kind: s,
-            names: [u.name],
-            inputs: H(u.inputs),
-            outputs: tt(u.outputs)
+            names: [l.name],
+            inputs: H(l.inputs),
+            outputs: tt(l.outputs)
           };
       }
     }
   } else if (s === "customMethod") {
-    if (L(l.key) && e.type === "comp") {
+    if (L(_.key) && e.type === "comp") {
       const d = n.meta.methods?.find(
-        (u) => u.id === r
+        (l) => l.id === r
       );
       if (d)
         return {
@@ -1324,10 +1299,10 @@ function $e(t) {
         };
     }
   } else if (s === "customSlotMethod") {
-    if (L(l.key) && e.type === "comp" && n.meta.slots) {
-      const { slotId: d, methodId: u } = Qe(r), h = n.meta.slots.find((p) => p.id === d);
+    if (L(_.key) && e.type === "comp" && n.meta.slots) {
+      const { slotId: d, methodId: l } = Qe(r), h = n.meta.slots.find((p) => p.id === d);
       if (h && h.methods) {
-        const p = h.methods.find((f) => f.id === u);
+        const p = h.methods.find((f) => f.id === l);
         if (p)
           return {
             id: t,
@@ -1339,14 +1314,14 @@ function $e(t) {
       }
     }
   } else if (s === "adaptSlotElementMethod") {
-    if (L(l.key) && e.type === "comp") {
+    if (L(_.key) && e.type === "comp") {
       const {
         elementKey: d,
-        slotKey: u,
+        slotKey: l,
         methodKey: h
       } = us(r), p = V[d];
       if (p && p.slots) {
-        const f = p.slots.find((T) => T.key === u);
+        const f = p.slots.find((T) => T.key === l);
         if (f && f.methods) {
           const T = f.methods.find((E) => E.key === h);
           if (T)
@@ -1360,10 +1335,10 @@ function $e(t) {
         }
       }
     }
-  } else if (s === "adaptSlotCustomMethod" && L(l.key) && e.type === "comp") {
-    const { compId: d, slotId: u, methodId: h } = Qe(r), p = o[d];
+  } else if (s === "adaptSlotCustomMethod" && L(_.key) && e.type === "comp") {
+    const { compId: d, slotId: l, methodId: h } = Qe(r), p = o[d];
     if (p && p.meta.slots) {
-      const f = p.meta.slots.find((T) => T.id === u);
+      const f = p.meta.slots.find((T) => T.id === l);
       if (f && f.methods) {
         const T = f.methods.find((E) => E.id === h);
         if (T)
@@ -1378,8 +1353,8 @@ function $e(t) {
     }
   }
 }
-function Gs(t) {
-  const e = [], n = on(t);
+function Hs(t) {
+  const e = [], n = nn(t);
   for (const { id: o, kind: s, names: a } of n)
     e.push([ve(s, a), o]);
   return B(e);
@@ -1428,14 +1403,14 @@ function Ut(t) {
         };
     }
   } else if (o === "customSlotMethod" && s === "globality" && e.type === "comp" && n.meta.slots) {
-    const { slotId: r, methodId: c } = Qe(a), l = n.meta.slots.find((d) => d.id === r);
-    if (l && l.methods) {
-      const d = l.methods.find((u) => u.id === c);
+    const { slotId: r, methodId: c } = Qe(a), _ = n.meta.slots.find((d) => d.id === r);
+    if (_ && _.methods) {
+      const d = _.methods.find((l) => l.id === c);
       if (d)
         return {
           id: t,
           kind: o,
-          names: [l.name, d.name],
+          names: [_.name, d.name],
           inputs: H(d.inputs),
           outputs: tt(d.outputs)
         };
@@ -1448,51 +1423,51 @@ function lo() {
     t.push([ve(o, s), n]);
   return B(t);
 }
-function sn(t) {
+function on(t) {
   const e = Ut(t);
   return e ? e.outputs : [];
 }
-function He(t, e) {
+function $e(t, e) {
   const n = Ut(t);
   if (n)
     return n.outputs?.find((o) => o.key === e);
 }
-function Ws(t) {
-  const e = [], n = sn(t);
+function Gs(t) {
+  const e = [], n = on(t);
   if (n)
     for (const { name: o, key: s } of n)
       e.push([o, s]);
   return B(e);
 }
-function js(t, e, n) {
+function Ws(t, e, n) {
   const { properties: o } = I.runtime, { activeObject: s, activePage: a, activeComp: r, depends: c } = I.app;
   if (t.events && t.events.length > 0)
     return !1;
   if (et(t.key) && n) {
-    const l = c[n];
-    if (l && l.meta.events && l.meta.events.length > 0)
+    const _ = c[n];
+    if (_ && _.meta.events && _.meta.events.length > 0)
       return !1;
   }
   if (nt(t.key) && n) {
-    const l = c[n];
-    if (l && l.meta.events && l.meta.events.length > 0)
+    const _ = c[n];
+    if (_ && _.meta.events && _.meta.events.length > 0)
       return !1;
   }
   if (L(t.key) && s.type === "comp" && r.meta.events && r.meta.events.length > 0)
     return !1;
   if (o[t.key] && o[t.key][e]) {
-    for (const { keys: l, raw: d } of o[t.key][e])
-      if (!ke(l, d))
+    for (const { keys: _, raw: d } of o[t.key][e])
+      if (!ke(_, d))
         return !1;
   }
   if (et(t.key) && n) {
-    const l = c[n];
-    if (l && l.meta.properties && l.meta.properties.length > 0)
+    const _ = c[n];
+    if (_ && _.meta.properties && _.meta.properties.length > 0)
       return !1;
   }
   if (nt(t.key) && n) {
-    const l = c[n];
-    if (l && l.meta.properties && l.meta.properties.length > 0)
+    const _ = c[n];
+    if (_ && _.meta.properties && _.meta.properties.length > 0)
       return !1;
   }
   if (L(t.key) && s.type === "comp" && r.meta.properties && r.meta.properties.length > 0)
@@ -1506,7 +1481,7 @@ function js(t, e, n) {
   }
   return !0;
 }
-function Xs(t, e) {
+function js(t, e) {
   const { activeObject: n, activeComp: o, depends: s } = I.app;
   if (t.methods && t.methods.length > 0)
     return !1;
@@ -1522,7 +1497,7 @@ function Xs(t, e) {
   }
   return L(t.key) && n.type === "comp" && o.meta.methods && o.meta.methods.length > 0 ? !1 : (L(t.key) && n.type, !0);
 }
-function Js(t, e, n) {
+function Xs(t, e, n) {
   const { properties: o } = I.runtime, { activeObject: s, activeComp: a, depends: r } = I.app;
   if (o[t.key] && o[t.key][e] && o[t.key][e].length > 0)
     return !1;
@@ -1538,11 +1513,11 @@ function Js(t, e, n) {
   }
   return !(L(t.key) && s.type === "comp" && a.meta.properties && a.meta.properties.length > 0);
 }
-function qs(t, e, n) {
+function Js(t, e, n) {
   const { properties: o } = I.runtime, { activeObject: s, activeComp: a, depends: r } = I.app;
   if (o[t.key] && o[t.key][e]) {
-    for (const { keys: c, raw: l } of o[t.key][e])
-      if (!ke(c, l))
+    for (const { keys: c, raw: _ } of o[t.key][e])
+      if (!ke(c, _))
         return !1;
   }
   if (et(t.key) && n) {
@@ -1558,7 +1533,7 @@ function qs(t, e, n) {
   return !(L(t.key) && s.type === "comp" && a.meta.properties && a.meta.properties.length > 0);
 }
 function _o(t, e, n, o) {
-  return t ? t === "onEvent" ? js(e, n, o) : t === "callMethod" ? Xs(e, o) : t === "getProperty" ? Js(e, n, o) : t === "setProperty" ? qs(e, n, o) : !1 : !1;
+  return t ? t === "onEvent" ? Ws(e, n, o) : t === "callMethod" ? js(e, o) : t === "getProperty" ? Xs(e, n, o) : t === "setProperty" ? Js(e, n, o) : !1 : !1;
 }
 function Z(t) {
   const { activeObject: e } = I.app, n = Vt(e.type, e.subtype);
@@ -1570,7 +1545,7 @@ function Z(t) {
       console.assert(!1, "invalid element", o.key);
       continue;
     }
-    if (!_o(t, s, n, o.settings?.comp))
+    if (!_o(t, s, n, o.comp))
       return !0;
   }
   return !1;
@@ -1585,7 +1560,7 @@ function zt(t) {
       console.assert(!1, "invalid element", s.key);
       continue;
     }
-    _o(t, a, o, s.settings?.comp) || n.push({
+    _o(t, a, o, s.comp) || n.push({
       id: s.id,
       key: s.key,
       name: a.name,
@@ -1618,20 +1593,45 @@ function Se(t) {
   }
   return B(n);
 }
+function sn(t) {
+  const { appList: e } = I.app, n = [], o = e.find((s) => s.id === t);
+  if (!o)
+    return n;
+  for (const { id: s, name: a } of o.pages)
+    n.push({ id: s, name: a });
+  return n;
+}
+function He(t, e) {
+  const { appList: n } = I.app, o = n.find((a) => a.id === t);
+  if (!o)
+    return;
+  const s = o.pages.find((a) => a.id === e);
+  if (s)
+    return {
+      id: s.id,
+      name: s.name
+    };
+}
+function qs(t) {
+  const e = [];
+  return sn(t).forEach(({ id: o, name: s }) => {
+    e.push([s, o]);
+  }), B(e);
+}
 function Wt(t, e) {
   const { properties: n } = I.runtime, { activeObject: o, activeComp: s, depends: a } = I.app, r = [], c = Vt(o.type, o.subtype);
   if (!c)
     return r;
-  const l = o.nodes.find((u) => u.id === t);
-  if (!l)
+  const _ = o.nodes.find((l) => l.id === t);
+  if (!_)
     return r;
-  const d = V[l.key];
+  const d = V[_.key];
   if (!d)
-    return console.assert(!1, "invalid element", l.key), r;
+    return console.assert(!1, "invalid element", _.key), r;
   if (n[d.key] && n[d.key][c])
-    for (const { keys: u, names: h, raw: p } of n[d.key][c])
-      e === "write" && ke(u, p) || r.push({
-        id: kt("elementProperty", t, u),
+    for (const { keys: l, names: h, raw: p } of n[d.key][c])
+      e === "write" && ke(l, p) || r.push({
+        id: kt("elementProperty", t, l),
         kind: "elementProperty",
         names: h,
         meta: {
@@ -1639,10 +1639,10 @@ function Wt(t, e) {
           raw: p
         }
       });
-  if (et(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.properties)
-      for (const { id: h, name: p, type: f } of u.meta.properties)
+  if (et(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.properties)
+      for (const { id: h, name: p, type: f } of l.meta.properties)
         r.push({
           id: kt("refProperty", t, h),
           kind: "refProperty",
@@ -1652,10 +1652,10 @@ function Wt(t, e) {
           }
         });
   }
-  if (nt(d.key) && l.settings && l.settings.comp) {
-    const u = a[l.settings.comp];
-    if (u && u.meta.properties)
-      for (const { id: h, name: p, type: f } of u.meta.properties)
+  if (nt(d.key) && _.comp) {
+    const l = a[_.comp];
+    if (l && l.meta.properties)
+      for (const { id: h, name: p, type: f } of l.meta.properties)
         r.push({
           id: kt("multipleRefProperty", t, h),
           kind: "multipleRefProperty",
@@ -1666,38 +1666,36 @@ function Wt(t, e) {
         });
   }
   if (L(d.key) && o.type === "comp" && s.meta.properties)
-    for (const { id: u, name: h, type: p } of s.meta.properties)
+    for (const { id: l, name: h, type: p } of s.meta.properties)
       r.push({
-        id: kt("customProperty", t, u),
+        id: kt("customProperty", t, l),
         kind: "customProperty",
         names: [h],
         meta: {
           raw: { type: p }
         }
       });
-  if (io(d.key) && l.settings && l.settings.slot && o.type === "comp" && s.meta.slots) {
-    const u = s.meta.slots.find(
-      (h) => h.id === l.settings.slot
-    );
-    if (u && u.properties)
-      for (const h of u.properties)
+  if (io(d.key) && _.slot && o.type === "comp" && s.meta.slots) {
+    const l = s.meta.slots.find((h) => h.id === _.slot);
+    if (l && l.properties)
+      for (const h of l.properties)
         r.push({
           id: kt("customSlotProperty", t, h.id),
           kind: "customSlotProperty",
-          names: [u.name, h.name],
+          names: [l.name, h.name],
           meta: {
             raw: { type: h.type }
           }
         });
   }
-  if (L(d.key) && o.type === "comp" && l.settings && l.settings.adaptSlot) {
-    const u = ae(l.settings.adaptSlot);
-    if (u) {
-      if (u.kind === "elementSlot") {
-        const h = V[u.mainKey];
+  if (L(d.key) && o.type === "comp" && _.adaptSlot) {
+    const l = ae(_.adaptSlot);
+    if (l) {
+      if (l.kind === "elementSlot") {
+        const h = V[l.mainKey];
         if (h && h.slots) {
           const p = h.slots.find(
-            (f) => f.key === u.slotKey
+            (f) => f.key === l.slotKey
           );
           if (p && p.properties)
             for (const f of p.properties)
@@ -1718,11 +1716,11 @@ function Wt(t, e) {
                 }
               });
         }
-      } else if (u.kind === "customSlot") {
-        const h = a[u.mainKey];
+      } else if (l.kind === "customSlot") {
+        const h = a[l.mainKey];
         if (h && h.meta.slots) {
           const p = h.meta.slots.find(
-            (f) => f.id === u.slotKey
+            (f) => f.id === l.slotKey
           );
           if (p && p.properties)
             for (const f of p.properties)
@@ -1731,7 +1729,7 @@ function Wt(t, e) {
                   "adaptSlotCustomProperty",
                   t,
                   qe(
-                    u.mainKey,
+                    l.mainKey,
                     p.id,
                     f.id
                   )
@@ -1754,18 +1752,18 @@ function Nt(t) {
   const { properties: e } = I.runtime, { activeObject: n, activeComp: o, depends: s } = I.app, a = Vt(n.type, n.subtype);
   if (!a)
     return;
-  const { kind: r, nodeId: c, propertyKey: l } = _s(t), d = n.nodes.find((h) => h.id === c);
+  const { kind: r, nodeId: c, propertyKey: _ } = _s(t), d = n.nodes.find((h) => h.id === c);
   if (!d)
     return;
-  const u = V[d.key];
-  if (!u) {
+  const l = V[d.key];
+  if (!l) {
     console.assert(!1, "invalid element", d.key);
     return;
   }
   if (r === "elementProperty") {
-    if (e[u.key] && e[u.key][a]) {
-      const h = e[u.key][a].find(
-        (p) => p.keys === l
+    if (e[l.key] && e[l.key][a]) {
+      const h = e[l.key][a].find(
+        (p) => p.keys === _
       );
       if (h)
         return {
@@ -1779,11 +1777,11 @@ function Nt(t) {
         };
     }
   } else if (r === "referenceProperty") {
-    if (et(u.key) && d.settings && d.settings.comp) {
-      const h = s[d.settings.comp];
+    if (et(l.key) && d.comp) {
+      const h = s[d.comp];
       if (h) {
         const p = h.meta.properties?.find(
-          (f) => f.id === l
+          (f) => f.id === _
         );
         if (p)
           return {
@@ -1797,11 +1795,11 @@ function Nt(t) {
       }
     }
   } else if (r === "multipleRefProperty") {
-    if (nt(u.key) && d.settings && d.settings.comp) {
-      const h = s[d.settings.comp];
+    if (nt(l.key) && d.comp) {
+      const h = s[d.comp];
       if (h) {
         const p = h.meta.properties?.find(
-          (f) => f.id === l
+          (f) => f.id === _
         );
         if (p)
           return {
@@ -1815,9 +1813,9 @@ function Nt(t) {
       }
     }
   } else if (r === "customProperty") {
-    if (L(u.key) && n.type === "comp") {
+    if (L(l.key) && n.type === "comp") {
       const h = o.meta.properties?.find(
-        (p) => p.id === l
+        (p) => p.id === _
       );
       if (h)
         return {
@@ -1830,12 +1828,10 @@ function Nt(t) {
         };
     }
   } else if (r === "customSlotProperty") {
-    if (io(u.key) && d.settings && d.settings.slot && n.type === "comp" && o.meta.slots) {
-      const h = o.meta.slots.find(
-        (p) => p.id === d.settings.slot
-      );
+    if (io(l.key) && d.slot && n.type === "comp" && o.meta.slots) {
+      const h = o.meta.slots.find((p) => p.id === d.slot);
       if (h && h.properties) {
-        const p = h.properties.find((f) => f.id === l);
+        const p = h.properties.find((f) => f.id === _);
         if (p)
           return {
             id: t,
@@ -1848,12 +1844,12 @@ function Nt(t) {
       }
     }
   } else if (r === "adaptSlotElementProperty") {
-    if (L(u.key) && n.type === "comp") {
+    if (L(l.key) && n.type === "comp") {
       const {
         elementKey: h,
         slotKey: p,
         propertyKey: f
-      } = qn(l), T = V[h];
+      } = qn(_), T = V[h];
       if (T && T.slots) {
         const E = T.slots.find((y) => y.key === p);
         if (E && E.properties) {
@@ -1872,8 +1868,8 @@ function Nt(t) {
         }
       }
     }
-  } else if (r === "adaptSlotCustomProperty" && L(u.key) && n.type === "comp") {
-    const { compId: h, slotId: p, propertyId: f } = Je(l), T = s[h];
+  } else if (r === "adaptSlotCustomProperty" && L(l.key) && n.type === "comp") {
+    const { compId: h, slotId: p, propertyId: f } = Je(_), T = s[h];
     if (T && T.meta.slots) {
       const E = T.meta.slots.find((y) => y.id === p);
       if (E && E.properties) {
@@ -1969,7 +1965,7 @@ const zs = {
     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 = nn(this.node.id)?.[0];
+    const n = en(this.node.id)?.[0];
     if (!n)
       return;
     this.event.id = n.id, this.event.kind = n.kind, this.event.names = n.names, this.event.params = n.params;
@@ -1991,7 +1987,7 @@ const zs = {
     return Se("onEvent");
   },
   genEventOpts_: function() {
-    return $s(this.node.id);
+    return Ks(this.node.id);
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2012,14 +2008,14 @@ const zs = {
     const n = this.node.key !== e.key;
     this.node.id = e.id, this.node.key = e.key, this.node.alias = e.alias;
     const o = this.getField("EVENT");
-    if (o.getOptions(!1), n || !Ke(this.event.id)) {
-      const s = nn(this.node.id)?.[0];
+    if (o.getOptions(!1), n || !we(this.event.id)) {
+      const s = en(this.node.id)?.[0];
       o.setValue(s?.id ?? "");
     }
     this.onEventChange_(o.getValue());
   },
   onEventChange_: function(t) {
-    const e = Ke(t);
+    const e = we(t);
     e ? (this.event.id = e.id, this.event.kind = e.kind, this.event.names = e.names, this.event.params = e.params) : (this.event.id = "", this.event.kind = "", this.event.names = [], this.event.params = void 0), this.updateShape_(), setTimeout(() => {
       this.ensureBlocks_();
     }, 0);
@@ -2064,7 +2060,7 @@ const zs = {
       return;
     }
     t.alias !== this.node.alias && (this.node.alias = t.alias);
-    const e = Ke(this.event.id);
+    const e = we(this.event.id);
     if (!e) {
       this.setWarningText(m("WARN_EVENT_NOT_FOUND"));
       return;
@@ -2124,7 +2120,7 @@ const Zs = {
     }, 0);
   },
   genEventOpts_: function() {
-    return Hs();
+    return $s();
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2189,7 +2185,7 @@ i.forBlock.trigger_app_event_v1 = function(t) {
       const r = i.valueToCode(
         n,
         "PARAM" + a,
-        _.NONE
+        u.NONE
       );
       o && (o += ", "), o += r;
     }
@@ -2238,7 +2234,7 @@ g([
   }
 ]);
 i.forBlock.app_debug_trace_v1 = function(t) {
-  return `__debugTraceV1__(${i.valueToCode(t, "OBJECT", _.NONE)});
+  return `__debugTraceV1__(${i.valueToCode(t, "OBJECT", u.NONE)});
 `;
 };
 const ti = {
@@ -2272,7 +2268,7 @@ const ti = {
 };
 A.open_confirm_dlg_v1 = ti;
 i.forBlock.open_confirm_dlg_v1 = function(t) {
-  const e = i.valueToCode(t, "TITLE", _.ATOMIC), n = i.valueToCode(t, "TEXT", _.ATOMIC), o = i.statementToCode(t, "HANDLE");
+  const e = i.valueToCode(t, "TITLE", u.ATOMIC), n = i.valueToCode(t, "TEXT", u.ATOMIC), o = i.statementToCode(t, "HANDLE");
   return `{
   var __result__ = await __openConfirmDlgV1__(${e}, ${n});
 ${o}}
@@ -2311,7 +2307,7 @@ const ei = {
 };
 A.open_prompt_dlg_v1 = ei;
 i.forBlock.open_prompt_dlg_v1 = function(t) {
-  const e = i.valueToCode(t, "TITLE", _.ATOMIC), n = i.valueToCode(t, "LABEL", _.ATOMIC), o = i.valueToCode(t, "VALUE", _.ATOMIC), s = i.statementToCode(t, "HANDLE");
+  const e = i.valueToCode(t, "TITLE", u.ATOMIC), n = i.valueToCode(t, "LABEL", u.ATOMIC), o = i.valueToCode(t, "VALUE", u.ATOMIC), s = i.statementToCode(t, "HANDLE");
   return `{
   var __result__ = await __openPromptDlgV1__(${e}, ${n}, ${o});
 ${s}}
@@ -2345,7 +2341,7 @@ g([
   }
 ]);
 i.forBlock.popup_message_v1 = function(t) {
-  const e = i.quote_(t.getFieldValue("TYPE")), n = i.valueToCode(t, "TEXT", _.ATOMIC);
+  const e = i.quote_(t.getFieldValue("TYPE")), n = i.valueToCode(t, "TEXT", u.ATOMIC);
   return `__messageV1__(${e}, ${n});
 `;
 };
@@ -2373,7 +2369,7 @@ const ni = {
     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 = on(this.node.id)?.[0];
+    const n = nn(this.node.id)?.[0];
     if (!n)
       return;
     this.method.id = n.id, this.method.kind = n.kind, this.method.names = n.names, this.method.inputs = n.inputs, this.method.outputs = n.outputs;
@@ -2395,7 +2391,7 @@ const ni = {
     return Se("callMethod");
   },
   genMethodOpts_: function() {
-    return Gs(this.node.id);
+    return Hs(this.node.id);
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2416,14 +2412,14 @@ const ni = {
     const n = this.node.key !== e.key;
     this.node.id = e.id, this.node.key = e.key, this.node.alias = e.alias;
     const o = this.getField("METHOD");
-    if (o.getOptions(!1), n || !$e(this.method.id)) {
-      const s = on(this.node.id)?.[0];
+    if (o.getOptions(!1), n || !Ke(this.method.id)) {
+      const s = nn(this.node.id)?.[0];
       o.setValue(s?.id ?? "");
     }
     this.onMethodChange_(o.getValue());
   },
   onMethodChange_: function(t) {
-    const e = $e(t);
+    const e = Ke(t);
     e ? (this.method.id = e.id, this.method.kind = e.kind, this.method.names = e.names, this.method.inputs = e.inputs, this.method.outputs = e.outputs) : (this.method.id = "", this.method.kind = "", this.method.names = [], this.method.inputs = [], this.method.outputs = []), this.updateShape_(), this.updateShadow_(), setTimeout(() => {
       this.ensureBlocks_();
     }, 0);
@@ -2487,7 +2483,7 @@ const ni = {
       return;
     }
     t.alias !== this.node.alias && (this.node.alias = t.alias);
-    const e = $e(this.method.id);
+    const e = Ke(this.method.id);
     if (!e) {
       this.setWarningText(m("WARN_METHOD_NOT_FOUND"));
       return;
@@ -2511,37 +2507,37 @@ A.call_app_method_v1 = ni;
 i.forBlock.call_app_method_v1 = function(t) {
   const e = i.INDENT, n = i.quote_, o = t;
   let s;
-  o.method.kind === "multipleRefMethod" && (s = i.valueToCode(o, "REF_KEY", _.NONE) || "''");
+  o.method.kind === "multipleRefMethod" && (s = i.valueToCode(o, "REF_KEY", u.NONE) || "''");
   let a = "{";
   if (o.method.inputs)
     for (let c = 0; c < o.method.inputs.length; c++) {
-      const { key: l, type: d } = o.method.inputs[c];
-      let u = i.valueToCode(
+      const { key: _, type: d } = o.method.inputs[c];
+      let l = i.valueToCode(
         o,
         "INPUT" + c,
-        _.ATOMIC
+        u.ATOMIC
       );
-      if (u === void 0)
+      if (l === void 0)
         switch (d) {
           case "string":
-            u = "''";
+            l = "''";
             break;
           case "number":
-            u = "0";
+            l = "0";
             break;
           case "boolean":
-            u = "false";
+            l = "false";
             break;
           case "array":
-            u = "[]";
+            l = "[]";
             break;
           case "object":
-            u = "{}";
+            l = "{}";
             break;
           default:
-            u = "null";
+            l = "null";
         }
-      a !== "{" && (a += ", "), a += `${n(l)}: ${u}`;
+      a !== "{" && (a += ", "), a += `${n(_)}: ${l}`;
     }
   a += "}";
   let r = "";
@@ -2552,10 +2548,10 @@ i.forBlock.call_app_method_v1 = function(t) {
   if (o.method.kind === "customMethod") {
     const { methodKey: c } = qt(o.method.id);
     if (o.method.outputs && o.method.outputs.length > 0) {
-      const l = i.statementToCode(o, "HANDLE");
+      const _ = i.statementToCode(o, "HANDLE");
       return `{
   var __outputs__ = __implementMethod$${c}__(${a});
-${r}${l}}
+${r}${_}}
 `;
     } else
       return `__implementMethod$${c}__(${a});
@@ -2660,8 +2656,8 @@ i.forBlock.implement_app_method_v1 = function(t) {
   const e = i.INDENT, n = i.quote_, o = t, { methodKey: s } = qt(o.method.id);
   let a = "";
   if (o.method.inputs)
-    for (const { key: l } of o.method.inputs)
-      a += `${e}var __input$${l}__ = __inputs__[${n(l)}];
+    for (const { key: _ } of o.method.inputs)
+      a += `${e}var __input$${_}__ = __inputs__[${n(_)}];
 `;
   const r = i.statementToCode(o, "HANDLE");
   return `async function __implementMethod$${s}__(__inputs__) {
@@ -2697,7 +2693,7 @@ const si = {
     this.method.id = t.id, this.method.kind = t.kind, this.method.names = t.names;
     const e = this.getField("METHOD");
     e.getOptions(!1), e.setValue(this.method.id);
-    const n = sn(this.method.id)?.[0];
+    const n = on(this.method.id)?.[0];
     if (!n)
       return;
     this.output.key = n.key, this.output.name = n.name, this.output.type = n.type;
@@ -2719,7 +2715,7 @@ const si = {
     return lo();
   },
   genOutputOpts_: function() {
-    return Ws(this.method.id);
+    return Gs(this.method.id);
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2740,14 +2736,14 @@ const si = {
     const n = this.method.id !== e.id;
     this.method.id = e.id, this.method.kind = e.kind, this.method.names = e.names;
     const o = this.getField("OUTPUT");
-    if (o.getOptions(!1), n || !He(this.method.id, this.output.key)) {
-      const s = sn(this.method.id)?.[0];
+    if (o.getOptions(!1), n || !$e(this.method.id, this.output.key)) {
+      const s = on(this.method.id)?.[0];
       o.setValue(s?.key ?? "");
     }
     this.onOutputChange_(o.getValue());
   },
   onOutputChange_: function(t) {
-    const e = He(this.method.id, t);
+    const e = $e(this.method.id, t);
     e ? (this.output.key = e.key, this.output.name = e.name, this.output.type = e.type) : (this.output.key = "", this.output.name = "", this.output.type = "string");
   },
   updateShape_: function() {
@@ -2775,7 +2771,7 @@ const si = {
       return;
     }
     t.names !== this.method.names && (this.method.names = t.names);
-    const e = He(
+    const e = $e(
       this.method.id,
       this.output.key
     );
@@ -2793,7 +2789,7 @@ const si = {
 A.set_app_method_output_v1 = si;
 i.forBlock.set_app_method_output_v1 = function(t) {
   const e = i.quote_, n = t;
-  let o = i.valueToCode(n, "VALUE", _.ATOMIC);
+  let o = i.valueToCode(n, "VALUE", u.ATOMIC);
   if (o === void 0)
     switch (n.output.type) {
       case "string":
@@ -2838,7 +2834,7 @@ g([
   }
 ]);
 i.forBlock.app_env_is_v1 = function(t) {
-  return [`__getEnvV1__() === ${i.quote_(t.getFieldValue("ENV"))}`, _.ATOMIC];
+  return [`__getEnvV1__() === ${i.quote_(t.getFieldValue("ENV"))}`, u.ATOMIC];
 };
 const ii = {
   init: function() {
@@ -2859,7 +2855,7 @@ const ii = {
     this.app.id = t.id, this.app.name = t.name;
     const e = this.getField("APP");
     e.getOptions(!1), e.setValue(this.app.id);
-    const n = en(this.app.id)?.[0];
+    const n = sn(this.app.id)?.[0];
     if (!n)
       return;
     this.page.id = n.id, this.page.name = n.name;
@@ -2881,7 +2877,7 @@ const ii = {
     return Fs();
   },
   genPageOpts_: function() {
-    return ws(this.app.id);
+    return qs(this.app.id);
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2902,13 +2898,13 @@ const ii = {
     const n = this.app.id !== e.id;
     this.app.id = e.id, this.app.name = e.name;
     const o = this.getField("PAGE");
-    if (o.getOptions(!1), n || !we(this.app.id, this.page.id)) {
-      const a = en(this.app.id)?.[0]?.id ?? "";
+    if (o.getOptions(!1), n || !He(this.app.id, this.page.id)) {
+      const a = sn(this.app.id)?.[0]?.id ?? "";
       o.setValue(a), this.page.id === a && this.onPageChange_(a);
     }
   },
   onPageChange_: function(t) {
-    const e = we(this.app.id, t);
+    const e = He(this.app.id, t);
     e ? (this.page.id = e.id, this.page.name = e.name) : (this.page.id = "", this.page.name = "");
   },
   checkWarning_: function() {
@@ -2918,7 +2914,7 @@ const ii = {
       return;
     }
     t.name !== this.app.name && (this.app.name = t.name);
-    const e = we(this.app.id, this.page.id);
+    const e = He(this.app.id, this.page.id);
     if (!e) {
       this.setWarningText(m("WARN_PAGE_NOT_FOUND"));
       return;
@@ -2960,7 +2956,7 @@ const ai = {
     }, 0);
   },
   genCompOpts_: function() {
-    return Ks();
+    return ws();
   },
   onchange: function(t) {
     if (t.type === P.STATE_CHANGE)
@@ -2987,8 +2983,8 @@ const ai = {
 };
 A.select_comp_v1 = ai;
 i.forBlock.select_comp_v1 = function(t) {
-  const e = i.quote_, o = t.comp.id ?? "";
-  return [e(o), _.ATOMIC];
+  const e = i.quote_, o = t.comp.id;
+  return [e(o), u.ATOMIC];
 };
 const ci = {
   init: function() {
@@ -3045,8 +3041,8 @@ const ci = {
 };
 A.select_slot_v1 = ci;
 i.forBlock.select_slot_v1 = function(t) {
-  const e = i.quote_, o = t.slot.id ?? "";
-  return [e(o), _.ATOMIC];
+  const e = i.quote_, o = t.slot.id;
+  return [e(o), u.ATOMIC];
 };
 const ri = {
   init: function() {
@@ -3151,7 +3147,7 @@ const ri = {
 A.get_app_property_v1 = ri;
 i.forBlock.get_app_property_v1 = function(t) {
   const e = i.quote_;
-  return [`__getPropertyV1__(${e(t.property.id)}, ${e("")})`, _.ATOMIC];
+  return [`__getPropertyV1__(${e(t.property.id)}, ${e("")})`, u.ATOMIC];
 };
 const ui = {
   init: function() {
@@ -3271,7 +3267,7 @@ const ui = {
 };
 A.set_app_property_v1 = ui;
 i.forBlock.set_app_property_v1 = function(t) {
-  const e = i.quote_, n = t, o = "", s = i.valueToCode(n, "VALUE", _.NONE);
+  const e = i.quote_, n = t, o = "", s = i.valueToCode(n, "VALUE", u.NONE);
   return `__setPropertyV1__(${e(n.property.id)}, ${e(o)}, ${s});
 `;
 };
@@ -3337,7 +3333,7 @@ const li = {
 A.get_app_state_v1 = li;
 i.forBlock.get_app_state_v1 = function(t) {
   const e = i.quote_;
-  return [`__getStateV1__(${e(t.state.id)})`, _.ATOMIC];
+  return [`__getStateV1__(${e(t.state.id)})`, u.ATOMIC];
 };
 const _i = {
   init: function() {
@@ -3405,7 +3401,7 @@ const _i = {
 };
 A.set_app_state_v1 = _i;
 i.forBlock.set_app_state_v1 = function(t) {
-  const e = i.quote_, n = t, o = i.valueToCode(n, "VALUE", _.NONE);
+  const e = i.quote_, n = t, o = i.valueToCode(n, "VALUE", u.NONE);
   return `__setStateV1__(${e(n.state.id)}, ${o});
 `;
 };
@@ -3440,7 +3436,7 @@ g([
   }
 ]);
 i.forBlock.color_blend_v1 = function(t) {
-  const e = i.valueToCode(t, "COLOR1", _.NONE) || "'#ffffff'", n = i.valueToCode(t, "COLOR2", _.NONE) || "'#000000'", o = i.valueToCode(t, "RATIO", _.NONE) || 0.5;
+  const e = i.valueToCode(t, "COLOR1", u.NONE) || "'#ffffff'", n = i.valueToCode(t, "COLOR2", u.NONE) || "'#000000'", o = i.valueToCode(t, "RATIO", u.NONE) || 0.5;
   return [`${i.provideFunction_(
     "colorBlend",
     `
@@ -3461,7 +3457,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
   return '#' + r + g + b;
 }
 `
-  )}(${e}, ${n}, ${o})`, _.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -4042,7 +4038,7 @@ g([
   }
 ]);
 i.forBlock.color_picker_v1 = function(t) {
-  return [i.quote_(t.getFieldValue("COLOR")), _.ATOMIC];
+  return [i.quote_(t.getFieldValue("COLOR")), u.ATOMIC];
 };
 g([
   {
@@ -4063,7 +4059,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}() {
   return '#' + ('00000' + num.toString(16)).substr(-6);
 }
 `
-  )}()`, _.FUNCTION_CALL];
+  )}()`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -4096,7 +4092,7 @@ g([
   }
 ]);
 i.forBlock.color_rgb_v1 = function(t) {
-  const e = i.valueToCode(t, "RED", _.NONE) || 0, n = i.valueToCode(t, "GREEN", _.NONE) || 0, o = i.valueToCode(t, "BLUE", _.NONE) || 0;
+  const e = i.valueToCode(t, "RED", u.NONE) || 0, n = i.valueToCode(t, "GREEN", u.NONE) || 0, o = i.valueToCode(t, "BLUE", u.NONE) || 0;
   return [`${i.provideFunction_(
     "colorRgb",
     `
@@ -4110,7 +4106,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
   return '#' + r + g + b;
 }
 `
-  )}(${e}, ${n}, ${o})`, _.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 const pi = N.xml, di = [
   {
@@ -4239,7 +4235,7 @@ const fi = {
 };
 A.parameter_v1 = fi;
 i.forBlock.parameter_v1 = function(t) {
-  return [t.key, _.ATOMIC];
+  return [t.key, u.ATOMIC];
 };
 const mi = {
   init: function() {
@@ -4449,22 +4445,22 @@ i.forBlock.call_func_v1 = function(t) {
     const f = i.valueToCode(
       o,
       "INPUT" + p,
-      _.ATOMIC
+      u.ATOMIC
     );
     r += `${e}${e}${n(h)}: ${f},
 `;
   }), r += `${e}};`;
   const c = n(o.space.name + "/" + o.func.name);
-  let l = "";
+  let _ = "";
   o.func.outputs.forEach(({ id: h }) => {
-    l += `${e}var __output${h}__ = __result__[${n(h)}];
+    _ += `${e}var __output${h}__ = __result__[${n(h)}];
 `;
   });
   const d = i.statementToCode(o, "CALLBACK");
   return `{
 ${r}
 ${e}var __result__ = __callFuncV1__(${s},${a},__inputs__,__getEnvV1__(),${c});
-${l}${d}}
+${_}${d}}
 `;
 };
 const gi = {
@@ -4623,15 +4619,15 @@ i.forBlock.call_func_internal_v1 = function(t) {
     const f = i.valueToCode(
       o,
       "INPUT" + p,
-      _.ATOMIC
+      u.ATOMIC
     );
     r += `${e}${e}${n(h)}: ${f},
 `;
   }), r += `${e}};`;
   const c = o.space.name + "/" + o.func.name;
-  let l = "";
+  let _ = "";
   o.func.outputs.forEach(({ id: h }) => {
-    l += `${e}var __output$${h}__ = __result__.outputs[${n(h)}];
+    _ += `${e}var __output$${h}__ = __result__.outputs[${n(h)}];
 `;
   });
   const d = i.statementToCode(o, "CALLBACK");
@@ -4641,7 +4637,7 @@ ${e}var __result__ = __callFuncInternalV1__(${s}, ${a}, __inputs__);
 ${e}if (!__result__.success) {
 ${e}${e}throw 'call func<${c}> failed, reason: ' + __result__.message;
 ${e}}
-${l}${d}}
+${_}${d}}
 `;
 };
 const Ai = {
@@ -4789,7 +4785,7 @@ const Ii = {
 A.set_func_output_v1 = Ii;
 i.forBlock.set_func_output_v1 = function(t) {
   const e = i.quote_, n = t, { id: o, type: s } = n.output;
-  let a = i.valueToCode(n, "VALUE", _.ATOMIC);
+  let a = i.valueToCode(n, "VALUE", u.ATOMIC);
   if (a === void 0)
     switch (s) {
       case "string":
@@ -4832,7 +4828,7 @@ g([
   }
 ]);
 i.forBlock.compute_debug_trace_v1 = function(t) {
-  return `__debugTraceV1__(${i.valueToCode(t, "OBJECT", _.ATOMIC)});
+  return `__debugTraceV1__(${i.valueToCode(t, "OBJECT", u.ATOMIC)});
 `;
 };
 g([
@@ -4856,7 +4852,7 @@ g([
   }
 ]);
 i.forBlock.compute_env_is_v1 = function(t) {
-  return [`__getEnvV1__() === ${i.quote_(t.getFieldValue("ENV"))}`, _.ATOMIC];
+  return [`__getEnvV1__() === ${i.quote_(t.getFieldValue("ENV"))}`, u.ATOMIC];
 };
 function at() {
   const t = [];
@@ -4931,9 +4927,9 @@ function Oi(t) {
         },
         itemCount: c.columns.length
       }, o = {};
-      for (let l = 0; l < c.columns.length; l++) {
-        const d = c.columns[l];
-        o["COLUMN" + l] = d.id;
+      for (let _ = 0; _ < c.columns.length; _++) {
+        const d = c.columns[_];
+        o["COLUMN" + _] = d.id;
       }
     }
   }
@@ -4993,7 +4989,7 @@ const Ci = {
 };
 A.add_data_v1 = Ci;
 i.forBlock.add_data_v1 = function(t) {
-  const e = i.INDENT, n = i.valueToCode(t, "TABLE", _.ATOMIC) || "null", o = i.statementToCode(t, "HANDLE");
+  const e = i.INDENT, n = i.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = i.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -5170,7 +5166,7 @@ const ki = {
 };
 A.cond_atomic_v1 = ki;
 i.forBlock.cond_atomic_v1 = function(t) {
-  const e = i.quote_, n = t, o = n.column.name, s = i.valueToCode(n, "VALUE", _.ATOMIC) || null, r = {
+  const e = i.quote_, n = t, o = n.column.name, s = i.valueToCode(n, "VALUE", u.ATOMIC) || null, r = {
     EQ: "=",
     NEQ: "!=",
     LT: "<",
@@ -5178,7 +5174,7 @@ i.forBlock.cond_atomic_v1 = function(t) {
     GT: ">",
     GTE: ">="
   }[n.getFieldValue("OP")];
-  return [`{type:'ATOMIC',key:${e(o)},value:${s},operator:${e(r)}}`, _.ATOMIC];
+  return [`{type:'ATOMIC',key:${e(o)},value:${s},operator:${e(r)}}`, u.ATOMIC];
 };
 const Si = {
   init: function() {
@@ -5268,13 +5264,13 @@ const Li = {
 };
 A.cond_logic_v1 = Li;
 i.forBlock.cond_logic_v1 = function(t) {
-  const e = i.quote_, n = t, o = n.getFieldValue("TYPE"), s = [], a = i.valueToCode(n, "VALUE", _.ATOMIC) || null;
+  const e = i.quote_, n = t, o = n.getFieldValue("TYPE"), s = [], a = i.valueToCode(n, "VALUE", u.ATOMIC) || null;
   s.push(a);
   for (let c = 0; c < n.itemCount_; c++) {
-    const l = i.valueToCode(n, "ADD" + c, _.ATOMIC) || null;
-    s.push(l);
+    const _ = i.valueToCode(n, "ADD" + c, u.ATOMIC) || null;
+    s.push(_);
   }
-  return [`{type:${e(o)},entries:[${s}]}`, _.ATOMIC];
+  return [`{type:${e(o)},entries:[${s}]}`, u.ATOMIC];
 };
 function Bi(t) {
   const e = t.getInput("TABLE").connection;
@@ -5368,7 +5364,7 @@ const Ri = {
 };
 A.delete_data_v1 = Ri;
 i.forBlock.delete_data_v1 = function(t) {
-  const e = i.INDENT, n = i.valueToCode(t, "TABLE", _.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", _.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
+  const e = i.INDENT, n = i.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", u.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -5401,7 +5397,7 @@ g([
   }
 ]);
 i.forBlock.interrupt_transaction_v1 = function(t) {
-  return `throw ${i.valueToCode(t, "VALUE", _.NONE) || "''"};
+  return `throw ${i.valueToCode(t, "VALUE", u.NONE) || "''"};
 `;
 };
 function Di(t) {
@@ -5425,9 +5421,9 @@ function Di(t) {
         },
         itemCount: c.columns.length
       }, o = {};
-      for (let l = 0; l < c.columns.length; l++) {
-        const d = c.columns[l];
-        o["COLUMN" + l] = d.id, o["ALIAS" + l] = d.name;
+      for (let _ = 0; _ < c.columns.length; _++) {
+        const d = c.columns[_];
+        o["COLUMN" + _] = d.id, o["ALIAS" + _] = d.name;
       }
     }
   }
@@ -5548,7 +5544,7 @@ const xi = {
 };
 A.query_data_v1 = xi;
 i.forBlock.query_data_v1 = function(t) {
-  const e = i.INDENT, n = i.valueToCode(t, "TABLE", _.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", _.ATOMIC) || "null", s = i.valueToCode(t, "EXTRA", _.ATOMIC) || "null", a = i.statementToCode(t, "HANDLE");
+  const e = i.INDENT, n = i.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", u.ATOMIC) || "null", s = i.valueToCode(t, "EXTRA", u.ATOMIC) || "null", a = i.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -5589,8 +5585,8 @@ g([
   }
 ]);
 i.forBlock.query_extra_limit_v1 = function(t) {
-  const e = i.valueToCode(t, "OFFSET", _.ATOMIC) || 0, n = i.valueToCode(t, "LIMIT", _.ATOMIC) || 0;
-  return [`{type:'limit',value:${e},value2:${n}}`, _.ATOMIC];
+  const e = i.valueToCode(t, "OFFSET", u.ATOMIC) || 0, n = i.valueToCode(t, "LIMIT", u.ATOMIC) || 0;
+  return [`{type:'limit',value:${e},value2:${n}}`, u.ATOMIC];
 };
 g([
   {
@@ -5616,8 +5612,8 @@ g([
   }
 ]);
 i.forBlock.query_extra_sortby_v1 = function(t) {
-  const e = i.valueToCode(t, "COLUMN", _.ATOMIC) || "''", n = i.valueToCode(t, "DESC", _.ATOMIC) || !1;
-  return [`{type:'sortby',value:${e},value2:${n}}`, _.ATOMIC];
+  const e = i.valueToCode(t, "COLUMN", u.ATOMIC) || "''", n = i.valueToCode(t, "DESC", u.ATOMIC) || !1;
+  return [`{type:'sortby',value:${e},value2:${n}}`, u.ATOMIC];
 };
 const Yi = {
   init: function() {
@@ -5843,14 +5839,14 @@ const wi = {
 A.select_column_v1 = wi;
 i.forBlock.select_column_v1 = function(t) {
   const e = i.quote_, n = t, o = n.space.id, s = n.table.id, a = [];
-  for (let l = 0; l < n.itemCount_; l++) {
-    const d = n.getFieldValue("COLUMN" + l), u = n.table.columns.find((p) => p.id === d).name, h = n.getFieldValue("ALIAS" + l);
-    a.push({ name: u, alias: h });
+  for (let _ = 0; _ < n.itemCount_; _++) {
+    const d = n.getFieldValue("COLUMN" + _), l = n.table.columns.find((p) => p.id === d).name, h = n.getFieldValue("ALIAS" + _);
+    a.push({ name: l, alias: h });
   }
   let r = "[";
-  return a.forEach(({ name: l, alias: d }, u) => {
-    u !== 0 && (r += ","), r += `{name:${e(l)},alias:${e(d)}}`;
-  }), r += "]", [`{spaceId:${e(o)},tableId:${e(s)},columns:${r}}`, _.ATOMIC];
+  return a.forEach(({ name: _, alias: d }, l) => {
+    l !== 0 && (r += ","), r += `{name:${e(_)},alias:${e(d)}}`;
+  }), r += "]", [`{spaceId:${e(o)},tableId:${e(s)},columns:${r}}`, u.ATOMIC];
 };
 const Ki = {
   init: function() {
@@ -5947,7 +5943,7 @@ const Ki = {
 A.select_table_v1 = Ki;
 i.forBlock.select_table_v1 = function(t) {
   const e = i.quote_, n = t, o = n.space.id, s = n.table.id;
-  return [`{spaceId:${e(o)},tableId:${e(s)}}`, _.ATOMIC];
+  return [`{spaceId:${e(o)},tableId:${e(s)}}`, u.ATOMIC];
 };
 const $i = {
   init: function() {
@@ -6235,7 +6231,7 @@ const Wi = {
           s && s.dispose();
         else if (s)
           continue;
-        const a = this.getFieldValue("COLUMN" + e), r = this.table.columns.find((l) => l.id === a);
+        const a = this.getFieldValue("COLUMN" + e), r = this.table.columns.find((_) => _.id === a);
         if (!r)
           continue;
         n.setCheck(null);
@@ -6274,14 +6270,14 @@ const Wi = {
 A.update_column_v1 = Wi;
 i.forBlock.update_column_v1 = function(t) {
   const e = i.quote_, n = t, o = n.space.id, s = n.table.id, a = [];
-  for (let l = 0; l < n.itemCount_; l++) {
-    const d = n.getFieldValue("COLUMN" + l), u = n.table.columns.find((p) => p.id === d).name, h = i.valueToCode(n, "ADD" + l, _.ATOMIC) || "null";
-    a.push({ name: u, value: h });
+  for (let _ = 0; _ < n.itemCount_; _++) {
+    const d = n.getFieldValue("COLUMN" + _), l = n.table.columns.find((p) => p.id === d).name, h = i.valueToCode(n, "ADD" + _, u.ATOMIC) || "null";
+    a.push({ name: l, value: h });
   }
   let r = "[";
-  return a.forEach(({ name: l, value: d }, u) => {
-    u !== 0 && (r += ","), r += `{name:${e(l)},value:${d}}`;
-  }), r += "]", [`{spaceId:${e(o)},tableId:${e(s)},columns:${r}}`, _.ATOMIC];
+  return a.forEach(({ name: _, value: d }, l) => {
+    l !== 0 && (r += ","), r += `{name:${e(_)},value:${d}}`;
+  }), r += "]", [`{spaceId:${e(o)},tableId:${e(s)},columns:${r}}`, u.ATOMIC];
 };
 function ji(t) {
   const e = t.getInput("TABLE").connection;
@@ -6304,9 +6300,9 @@ function ji(t) {
         },
         itemCount: c.columns.length
       }, o = {};
-      for (let l = 0; l < c.columns.length; l++) {
-        const d = c.columns[l];
-        o["COLUMN" + l] = d.id;
+      for (let _ = 0; _ < c.columns.length; _++) {
+        const d = c.columns[_];
+        o["COLUMN" + _] = d.id;
       }
     }
   }
@@ -6375,7 +6371,7 @@ const qi = {
 };
 A.update_data_v1 = qi;
 i.forBlock.update_data_v1 = function(t) {
-  const e = i.INDENT, n = i.valueToCode(t, "TABLE", _.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", _.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
+  const e = i.INDENT, n = i.valueToCode(t, "TABLE", u.ATOMIC) || "null", o = i.valueToCode(t, "CONDITION", u.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
   return `{
 ${e}var __tx__ = typeof(__tx__) !== 'undefined' ? __tx__ : null;
 ${e}var __table__ = ${n};
@@ -6647,8 +6643,8 @@ A.list_create_v1 = ca;
 i.forBlock.list_create_v1 = function(t) {
   const e = t, n = new Array(e.itemCount_);
   for (let s = 0; s < e.itemCount_; s++)
-    n[s] = i.valueToCode(e, "ADD" + s, _.NONE) || "null";
-  return ["[" + n.join(", ") + "]", _.ATOMIC];
+    n[s] = i.valueToCode(e, "ADD" + s, u.NONE) || "null";
+  return ["[" + n.join(", ") + "]", u.ATOMIC];
 };
 g([
   {
@@ -6675,7 +6671,7 @@ g([
   }
 ]);
 i.forBlock.list_delete_v1 = function(t) {
-  const e = i.valueToCode(t, "VALUE", _.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
+  const e = i.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
   return `${e}.splice(${n}, 1)`;
 };
 g([
@@ -6702,8 +6698,8 @@ g([
   }
 ]);
 i.forBlock.list_get_v1 = function(t) {
-  const e = i.valueToCode(t, "VALUE", _.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
-  return [`${e}[${n}]`, _.MEMBER];
+  const e = i.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
+  return [`${e}[${n}]`, u.MEMBER];
 };
 g([
   {
@@ -6734,8 +6730,8 @@ g([
   }
 ]);
 i.forBlock.list_get_sublist_v1 = function(t) {
-  const e = i.valueToCode(t, "LIST", _.MEMBER) || "[]", n = i.getAdjusted(t, "START"), o = i.getAdjusted(t, "END", 1);
-  return [`${e}.slice(${n}, ${o})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "LIST", u.MEMBER) || "[]", n = i.getAdjusted(t, "START"), o = i.getAdjusted(t, "END", 1);
+  return [`${e}.slice(${n}, ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -6755,7 +6751,7 @@ g([
   }
 ]);
 i.forBlock.list_is_empty_v1 = function(t) {
-  return [`!${i.valueToCode(t, "VALUE", _.MEMBER) || "[]"}.length`, _.LOGICAL_NOT];
+  return [`!${i.valueToCode(t, "VALUE", u.MEMBER) || "[]"}.length`, u.LOGICAL_NOT];
 };
 g([
   {
@@ -6781,8 +6777,8 @@ g([
   }
 ]);
 i.forBlock.list_join_v1 = function(t) {
-  const e = i.valueToCode(t, "LIST", _.MEMBER) || "[]", n = i.valueToCode(t, "DELIM", _.NONE) || "''";
-  return [`${e}.join(${n})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "LIST", u.MEMBER) || "[]", n = i.valueToCode(t, "DELIM", u.NONE) || "''";
+  return [`${e}.join(${n})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -6802,7 +6798,7 @@ g([
   }
 ]);
 i.forBlock.list_length_v1 = function(t) {
-  return [`${i.valueToCode(t, "VALUE", _.MEMBER) || "[]"}.length`, _.MEMBER];
+  return [`${i.valueToCode(t, "VALUE", u.MEMBER) || "[]"}.length`, u.MEMBER];
 };
 g([
   {
@@ -6823,7 +6819,7 @@ g([
   }
 ]);
 i.forBlock.list_reverse_v1 = function(t) {
-  return [`${i.valueToCode(t, "LIST", _.NONE) || "[]"}.slice().reverse()`, _.FUNCTION_CALL];
+  return [`${i.valueToCode(t, "LIST", u.NONE) || "[]"}.slice().reverse()`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -6855,7 +6851,7 @@ g([
   }
 ]);
 i.forBlock.list_set_v1 = function(t) {
-  const e = i.valueToCode(t, "LIST", _.MEMBER) || "[]", n = i.getAdjusted(t, "AT"), o = i.valueToCode(t, "VALUE", _.ASSIGNMENT) || "null";
+  const e = i.valueToCode(t, "LIST", u.MEMBER) || "[]", n = i.getAdjusted(t, "AT"), o = i.valueToCode(t, "VALUE", u.ASSIGNMENT) || "null";
   return `${e}[${n}] = ${o};
 `;
 };
@@ -6896,7 +6892,7 @@ g([
   }
 ]);
 i.forBlock.logic_boolean_v1 = function(t) {
-  return [t.getFieldValue("BOOL") === "TRUE" ? "true" : "false", _.ATOMIC];
+  return [t.getFieldValue("BOOL") === "TRUE" ? "true" : "false", u.ATOMIC];
 };
 const ua = {
   onchange: function(t) {
@@ -6963,8 +6959,8 @@ i.forBlock.logic_compare_v1 = function(t) {
     GT: ">",
     GTE: ">="
   }[t.getFieldValue("OP")];
-  let o = _.RELATIONAL;
-  (n === "==" || n === "!=") && (o = _.EQUALITY);
+  let o = u.RELATIONAL;
+  (n === "==" || n === "!=") && (o = u.EQUALITY);
   const s = i.valueToCode(t, "A", o) || "0", a = i.valueToCode(t, "B", o) || "0";
   return [`${s} ${n} ${a}`, o];
 };
@@ -7154,7 +7150,7 @@ i.forBlock.logic_if_v1 = function(t) {
     t
   ));
   do {
-    const o = i.valueToCode(t, "IF" + e, _.NONE) || "false";
+    const o = i.valueToCode(t, "IF" + e, u.NONE) || "false";
     let s = i.statementToCode(t, "DO" + e);
     i.STATEMENT_SUFFIX && (s = i.prefixLines(
       i.injectId(
@@ -7197,7 +7193,7 @@ g([
   }
 ]);
 i.forBlock.logic_negate_v1 = function(t) {
-  return [`!${i.valueToCode(t, "BOOL", _.LOGICAL_NOT) || "true"}`, _.LOGICAL_NOT];
+  return [`!${i.valueToCode(t, "BOOL", u.LOGICAL_NOT) || "true"}`, u.LOGICAL_NOT];
 };
 g([
   {
@@ -7231,7 +7227,7 @@ g([
   }
 ]);
 i.forBlock.logic_operation_v1 = function(t) {
-  const e = t.getFieldValue("OP") === "AND" ? "&&" : "||", n = e === "&&" ? _.LOGICAL_AND : _.LOGICAL_OR;
+  const e = t.getFieldValue("OP") === "AND" ? "&&" : "||", n = e === "&&" ? u.LOGICAL_AND : u.LOGICAL_OR;
   let o = i.valueToCode(t, "A", n), s = i.valueToCode(t, "B", n);
   if (!o && !s)
     o = "false", s = "false";
@@ -7290,8 +7286,8 @@ g([
   }
 ]);
 i.forBlock.logic_ternary_v1 = function(t) {
-  const e = i.valueToCode(t, "IF", _.CONDITIONAL) || "false", n = i.valueToCode(t, "THEN", _.CONDITIONAL) || "null", o = i.valueToCode(t, "ELSE", _.CONDITIONAL) || "null";
-  return [e + " ? " + n + " : " + o, _.CONDITIONAL];
+  const e = i.valueToCode(t, "IF", u.CONDITIONAL) || "false", n = i.valueToCode(t, "THEN", u.CONDITIONAL) || "null", o = i.valueToCode(t, "ELSE", u.CONDITIONAL) || "null";
+  return [e + " ? " + n + " : " + o, u.CONDITIONAL];
 };
 const pa = {
   customContextMenu: function(t) {
@@ -7457,7 +7453,7 @@ g([
 i.forBlock.for_v1 = function(t) {
   const e = i.INDENT, n = i.getVariableName(
     t.getFieldValue("VAR")
-  ), o = i.valueToCode(t, "FROM", _.ASSIGNMENT) || "0", s = i.valueToCode(t, "TO", _.ASSIGNMENT) || "0", a = i.valueToCode(t, "BY", _.ASSIGNMENT) || "1", r = i.addLoopTrap(
+  ), o = i.valueToCode(t, "FROM", u.ASSIGNMENT) || "0", s = i.valueToCode(t, "TO", u.ASSIGNMENT) || "0", a = i.valueToCode(t, "BY", u.ASSIGNMENT) || "1", r = i.addLoopTrap(
     i.statementToCode(t, "DO"),
     t
   );
@@ -7469,11 +7465,11 @@ ${r}}
 ${r}}
 `;
   } else {
-    let c = "", l = o;
-    !o.match(/^\w+$/) && !N.string.isNumber(o) && (l = i.nameDB_.getDistinctName(
+    let c = "", _ = o;
+    !o.match(/^\w+$/) && !N.string.isNumber(o) && (_ = i.nameDB_.getDistinctName(
       `${n}_from`,
       rt.NameType.VARIABLE
-    ), c += `var ${l} = ${o};
+    ), c += `var ${_} = ${o};
 `);
     let d = s;
     !s.match(/^\w+$/) && !N.string.isNumber(s) && (d = i.nameDB_.getDistinctName(
@@ -7481,16 +7477,16 @@ ${r}}
       rt.NameType.VARIABLE
     ), c += `var ${d} = ${s};
 `);
-    const u = i.nameDB_.getDistinctName(
+    const l = i.nameDB_.getDistinctName(
       `${n}_by`,
       rt.NameType.VARIABLE
     );
-    return c += `var ${u} = `, N.string.isNumber(a) ? c += `${Math.abs(Number(a))};
+    return c += `var ${l} = `, N.string.isNumber(a) ? c += `${Math.abs(Number(a))};
 ` : c += `Math.abs(${a});
-`, c += `if (${l} > ${d}) {
-${e}${u} = -${u};
+`, c += `if (${_} > ${d}) {
+${e}${l} = -${l};
 }
-`, c += `for (${n} = ${l}; ${u} >= 0 ? ${n} <= ${d} : ${n} >= ${d}; ${n} += ${u}) {
+`, c += `for (${n} = ${_}; ${l} >= 0 ? ${n} <= ${d} : ${n} >= ${d}; ${n} += ${l}) {
 ${r}}
 `, c;
   }
@@ -7535,7 +7531,7 @@ g([
 i.forBlock.for_each_v1 = function(t) {
   const e = i.INDENT, n = i.getVariableName(
     t.getFieldValue("VAR")
-  ), o = i.valueToCode(t, "LIST", _.ASSIGNMENT) || "[]", s = i.addLoopTrap(
+  ), o = i.valueToCode(t, "LIST", u.ASSIGNMENT) || "[]", s = i.addLoopTrap(
     i.statementToCode(t, "DO"),
     t
   );
@@ -7581,7 +7577,7 @@ g([
 ]);
 i.forBlock.repeat_v1 = function(t) {
   let e = "";
-  t.getField("TIMES") ? e = String(Number(t.getFieldValue("TIMES"))) : e = i.valueToCode(t, "TIMES", _.ASSIGNMENT) || "0";
+  t.getField("TIMES") ? e = String(Number(t.getFieldValue("TIMES"))) : e = i.valueToCode(t, "TIMES", u.ASSIGNMENT) || "0";
   const n = i.addLoopTrap(
     i.statementToCode(t, "DO"),
     t
@@ -7645,7 +7641,7 @@ i.forBlock.while_until_v1 = function(t) {
   let n = i.valueToCode(
     t,
     "CONDITION",
-    e === "UNTIL" ? _.LOGICAL_NOT : _.NONE
+    e === "UNTIL" ? u.LOGICAL_NOT : u.NONE
   ) || "false";
   e === "UNTIL" && (n = "!" + n);
   const o = i.addLoopTrap(
@@ -7728,13 +7724,13 @@ g([
 ]);
 i.forBlock.math_arithmetic_v1 = function(t) {
   const e = {
-    ADD: [" + ", _.ADDITION],
-    SUBTRACT: [" - ", _.SUBTRACTION],
-    MULTIPLY: [" * ", _.MULTIPLICATION],
-    DIVIDE: [" / ", _.DIVISION],
-    POWER: [null, _.NONE]
+    ADD: [" + ", u.ADDITION],
+    SUBTRACT: [" - ", u.SUBTRACTION],
+    MULTIPLY: [" * ", u.MULTIPLICATION],
+    DIVIDE: [" / ", u.DIVISION],
+    POWER: [null, u.NONE]
   }, [n, o] = e[t.getFieldValue("OP")], s = i.valueToCode(t, "A", o) || "0", a = i.valueToCode(t, "B", o) || "0";
-  return n ? [s + n + a, o] : [`Math.pow(${s}, ${a})`, _.FUNCTION_CALL];
+  return n ? [s + n + a, o] : [`Math.pow(${s}, ${a})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -7762,12 +7758,12 @@ g([
 ]);
 i.forBlock.math_constant_v1 = function(t) {
   return {
-    PI: ["Math.PI", _.MEMBER],
-    E: ["Math.E", _.MEMBER],
-    GOLDEN_RATIO: ["(1 + Math.sqrt(5)) / 2", _.DIVISION],
-    SQRT2: ["Math.SQRT2", _.MEMBER],
-    SQRT1_2: ["Math.SQRT1_2", _.MEMBER],
-    INFINITY: ["Infinity", _.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")];
 };
 g([
@@ -7799,8 +7795,8 @@ g([
   }
 ]);
 i.forBlock.math_constrain_v1 = function(t) {
-  const e = i.valueToCode(t, "VALUE", _.NONE) || "0", n = i.valueToCode(t, "LOW", _.NONE) || "0", o = i.valueToCode(t, "HIGH", _.NONE) || "Infinity";
-  return [`Math.min(Math.max(${e}, ${n}), ${o})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "VALUE", u.NONE) || "0", n = i.valueToCode(t, "LOW", u.NONE) || "0", o = i.valueToCode(t, "HIGH", u.NONE) || "Infinity";
+  return [`Math.min(Math.max(${e}, ${n}), ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -7826,8 +7822,8 @@ g([
   }
 ]);
 i.forBlock.math_modulo_v1 = function(t) {
-  const e = i.valueToCode(t, "DIVIDEND", _.MODULUS) || "0", n = i.valueToCode(t, "DIVISOR", _.MODULUS) || "0";
-  return [e + " % " + n, _.MODULUS];
+  const e = i.valueToCode(t, "DIVIDEND", u.MODULUS) || "0", n = i.valueToCode(t, "DIVISOR", u.MODULUS) || "0";
+  return [e + " % " + n, u.MODULUS];
 };
 g([
   {
@@ -7848,7 +7844,7 @@ g([
   }
 ]);
 i.forBlock.math_number_v1 = function(t) {
-  const e = Number(t.getFieldValue("NUM")), n = e >= 0 ? _.ATOMIC : _.UNARY_NEGATION;
+  const e = Number(t.getFieldValue("NUM")), n = e >= 0 ? u.ATOMIC : u.UNARY_NEGATION;
   return [String(e), n];
 };
 g([
@@ -7883,13 +7879,13 @@ g([
 ]);
 i.forBlock.math_number_property_v1 = function(t) {
   const e = {
-    EVEN: [" % 2 === 0", _.MODULUS, _.EQUALITY],
-    ODD: [" % 2 === 1", _.MODULUS, _.EQUALITY],
-    WHOLE: [" % 1 === 0", _.MODULUS, _.EQUALITY],
-    POSITIVE: [" > 0", _.RELATIONAL, _.RELATIONAL],
-    NEGATIVE: [" < 0", _.RELATIONAL, _.RELATIONAL],
-    DIVISIBLE_BY: [null, _.MODULUS, _.EQUALITY],
-    PRIME: [null, _.NONE, _.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, s, a] = e[t.getFieldValue("PROPERTY")], r = i.valueToCode(t, "NUMBER_TO_CHECK", s) || "0";
   let c;
   if (n === "PRIME")
@@ -7917,8 +7913,8 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(n) {
 `
     ) + "(" + r + ")";
   else if (n === "DIVISIBLE_BY") {
-    const l = i.valueToCode(t, "DIVISOR", _.MODULUS) || "0";
-    c = r + " % " + l + " === 0";
+    const _ = i.valueToCode(t, "DIVISOR", u.MODULUS) || "0";
+    c = r + " % " + _ + " === 0";
   } else
     c = r + o;
   return [c, a];
@@ -7959,13 +7955,13 @@ i.forBlock.math_on_list_v1 = function(t) {
   let n, o;
   switch (e) {
     case "SUM":
-      n = i.valueToCode(t, "LIST", _.MEMBER) || "[]", o = n + ".reduce(function(x, y) {return x + y;}, 0)";
+      n = i.valueToCode(t, "LIST", u.MEMBER) || "[]", o = n + ".reduce(function(x, y) {return x + y;}, 0)";
       break;
     case "MIN":
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = "Math.min.apply(null, " + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = "Math.min.apply(null, " + n + ")";
       break;
     case "MAX":
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = "Math.max.apply(null, " + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = "Math.max.apply(null, " + n + ")";
       break;
     case "AVERAGE": {
       const s = i.provideFunction_(
@@ -7976,7 +7972,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(myList) {
 }
 `
       );
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = s + "(" + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = s + "(" + n + ")";
       break;
     }
     case "MEDIAN": {
@@ -7995,7 +7991,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(myList) {
 }
 `
       );
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = s + "(" + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = s + "(" + n + ")";
       break;
     }
     case "MODE": {
@@ -8032,7 +8028,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(values) {
 }
 `
       );
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = s + "(" + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = s + "(" + n + ")";
       break;
     }
     case "STD_DEV": {
@@ -8052,7 +8048,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(numbers) {
 }
 `
       );
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = s + "(" + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = s + "(" + n + ")";
       break;
     }
     case "RANDOM": {
@@ -8065,13 +8061,13 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(list) {
 }
 `
       );
-      n = i.valueToCode(t, "LIST", _.NONE) || "[]", o = s + "(" + n + ")";
+      n = i.valueToCode(t, "LIST", u.NONE) || "[]", o = s + "(" + n + ")";
       break;
     }
     default:
       throw Error("Unknown operator: " + e);
   }
-  return [o, _.FUNCTION_CALL];
+  return [o, u.FUNCTION_CALL];
 };
 g([
   {
@@ -8084,7 +8080,7 @@ g([
   }
 ]);
 i.forBlock.math_random_float_v1 = function() {
-  return ["Math.random()", _.FUNCTION_CALL];
+  return ["Math.random()", u.FUNCTION_CALL];
 };
 g([
   {
@@ -8110,7 +8106,7 @@ g([
   }
 ]);
 i.forBlock.math_random_int_v1 = function(t) {
-  const e = i.valueToCode(t, "FROM", _.NONE) || "0", n = i.valueToCode(t, "TO", _.NONE) || "0";
+  const e = i.valueToCode(t, "FROM", u.NONE) || "0", n = i.valueToCode(t, "TO", u.NONE) || "0";
   return [i.provideFunction_(
     "mathRandomInt",
     `
@@ -8124,7 +8120,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(a, b) {
   return Math.floor(Math.random() * (b - a + 1) + a);
 }
 `
-  ) + "(" + e + ", " + n + ")", _.FUNCTION_CALL];
+  ) + "(" + e + ", " + n + ")", u.FUNCTION_CALL];
 };
 g([
   {
@@ -8153,7 +8149,7 @@ g([
   }
 ]);
 i.forBlock.math_round_v1 = function(t) {
-  const e = t.getFieldValue("OP"), n = i.valueToCode(t, "NUM", _.NONE) || "0";
+  const e = t.getFieldValue("OP"), n = i.valueToCode(t, "NUM", u.NONE) || "0";
   let o = "";
   switch (e) {
     case "ROUND":
@@ -8166,7 +8162,7 @@ i.forBlock.math_round_v1 = function(t) {
       o = `Math.floor(${n})`;
       break;
   }
-  return [o, _.FUNCTION_CALL];
+  return [o, u.FUNCTION_CALL];
 };
 g([
   {
@@ -8202,8 +8198,8 @@ i.forBlock.math_single_v1 = function(t) {
   const e = t.getFieldValue("OP");
   let n, o;
   if (e === "NEG")
-    return o = i.valueToCode(t, "NUM", _.UNARY_NEGATION) || "0", o[0] === "-" && (o = " " + o), n = "-" + o, [n, _.UNARY_NEGATION];
-  switch (o = i.valueToCode(t, "NUM", _.NONE) || "0", e) {
+    return o = i.valueToCode(t, "NUM", u.UNARY_NEGATION) || "0", o[0] === "-" && (o = " " + o), n = "-" + o, [n, u.UNARY_NEGATION];
+  switch (o = i.valueToCode(t, "NUM", u.NONE) || "0", e) {
     case "ROOT":
       n = `Math.sqrt(${o})`;
       break;
@@ -8221,15 +8217,12 @@ i.forBlock.math_single_v1 = function(t) {
       break;
   }
   if (n)
-    return [n, _.FUNCTION_CALL];
-  switch (e) {
-    case "LOG10":
-      n = `Math.log(${o}) / Math.log(10)`;
-      break;
-    default:
-      throw Error("Unknown math operator: " + e);
-  }
-  return [n, _.DIVISION];
+    return [n, u.FUNCTION_CALL];
+  if (e === "LOG10")
+    n = `Math.log(${o}) / Math.log(10)`;
+  else
+    throw Error("Unknown math operator: " + e);
+  return [n, u.DIVISION];
 };
 g([
   {
@@ -8263,7 +8256,7 @@ g([
 i.forBlock.math_trig_v1 = function(t) {
   let e;
   const n = t.getFieldValue("OP");
-  n === "SIN" || n === "COS" || n === "TAN" ? e = i.valueToCode(t, "NUM", _.DIVISION) || "0" : e = i.valueToCode(t, "NUM", _.NONE) || "0";
+  n === "SIN" || n === "COS" || n === "TAN" ? e = i.valueToCode(t, "NUM", u.DIVISION) || "0" : e = i.valueToCode(t, "NUM", u.NONE) || "0";
   let o;
   switch (n) {
     case "SIN":
@@ -8277,7 +8270,7 @@ i.forBlock.math_trig_v1 = function(t) {
       break;
   }
   if (o)
-    return [o, _.FUNCTION_CALL];
+    return [o, u.FUNCTION_CALL];
   switch (n) {
     case "ASIN":
       o = `Math.asin(${e}) / Math.PI * 180`;
@@ -8291,7 +8284,7 @@ i.forBlock.math_trig_v1 = function(t) {
     default:
       throw Error("Unknown math operator: " + n);
   }
-  return [o, _.DIVISION];
+  return [o, u.DIVISION];
 };
 const ma = N.xml, Ta = {
   init: function() {
@@ -8386,10 +8379,10 @@ i.forBlock.object_create_v1 = function(t) {
   const e = t;
   let n = "{";
   for (let o = 0; o < e.itemCount_; o++) {
-    const s = e.getFieldValue("KEY" + o), a = i.valueToCode(e, "ADD" + o, _.ATOMIC) || null;
+    const s = e.getFieldValue("KEY" + o), a = i.valueToCode(e, "ADD" + o, u.ATOMIC) || null;
     n += i.quote_(s) + ": " + a, o < e.itemCount_ - 1 && (n += ", ");
   }
-  return n += "}", [n, _.ATOMIC];
+  return n += "}", [n, u.ATOMIC];
 };
 g([
   {
@@ -8454,7 +8447,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(obj, key) {
   }
 }
 `
-  ), n = i.valueToCode(t, "OBJECT", _.ATOMIC) || "null", o = i.valueToCode(t, "KEY", _.ATOMIC) || "''";
+  ), n = i.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = i.valueToCode(t, "KEY", u.ATOMIC) || "''";
   return `${e}(${n}, ${o});
 `;
 };
@@ -8477,7 +8470,7 @@ g([
   }
 ]);
 i.forBlock.object_from_json_v1 = function(t) {
-  return [`__parseJsonV1__(${i.valueToCode(t, "JSON", _.NONE) || "''"})`, _.FUNCTION_CALL];
+  return [`__parseJsonV1__(${i.valueToCode(t, "JSON", u.NONE) || "''"})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -8533,8 +8526,8 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(obj, key) {
   }
 }
 `
-  ), n = i.valueToCode(t, "OBJECT", _.ATOMIC) || "null", o = i.valueToCode(t, "KEY", _.ATOMIC) || "''";
-  return [`${e}(${n}, ${o})`, _.FUNCTION_CALL];
+  ), n = i.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = i.valueToCode(t, "KEY", u.ATOMIC) || "''";
+  return [`${e}(${n}, ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -8598,7 +8591,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(obj, key, val) {
   }
 }
 `
-  ), n = i.valueToCode(t, "OBJECT", _.ATOMIC) || "null", o = i.valueToCode(t, "KEY", _.ATOMIC) || "''", s = i.valueToCode(t, "TO", _.ATOMIC) || "null";
+  ), n = i.valueToCode(t, "OBJECT", u.ATOMIC) || "null", o = i.valueToCode(t, "KEY", u.ATOMIC) || "''", s = i.valueToCode(t, "TO", u.ATOMIC) || "null";
   return `${e}(${n}, ${o}, ${s});
 `;
 };
@@ -8621,7 +8614,7 @@ g([
   }
 ]);
 i.forBlock.object_to_json_v1 = function(t) {
-  return [`__jsonStringifyV1__(${i.valueToCode(t, "OBJECT", _.NONE) || "null"})`, _.FUNCTION_CALL];
+  return [`__jsonStringifyV1__(${i.valueToCode(t, "OBJECT", u.NONE) || "null"})`, u.FUNCTION_CALL];
 };
 const Yn = N.xml, Aa = {
   init: function() {
@@ -8816,7 +8809,7 @@ const Oa = N.xml, va = {
 A.procedure_return_v1 = va;
 i.forBlock.procedure_return_v1 = function(t) {
   const e = t;
-  return e.withReturn ? `return ${i.valueToCode(e, "VALUE", _.NONE) || "null"};
+  return e.withReturn ? `return ${i.valueToCode(e, "VALUE", u.NONE) || "null"};
 ` : `return;
 `;
 };
@@ -8845,7 +8838,7 @@ const Ca = {
 };
 A.download_resource_v1 = Ca;
 i.forBlock.download_resource_v1 = function(t) {
-  const e = i.valueToCode(t, "ASSET", _.ATOMIC) || null, n = i.statementToCode(t, "HANDLE");
+  const e = i.valueToCode(t, "ASSET", u.ATOMIC) || null, n = i.statementToCode(t, "HANDLE");
   return `{
   var res = __downloadResourceV1__(${e});
   var __success__ = res.success;
@@ -9002,7 +8995,7 @@ const Ba = {
 };
 A.upload_resource_v1 = Ba;
 i.forBlock.upload_resource_v1 = function(t) {
-  const e = i.valueToCode(t, "NAME", _.ATOMIC) || "''", n = i.valueToCode(t, "DIR", _.ATOMIC) || "null", o = i.valueToCode(t, "DATA", _.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
+  const e = i.valueToCode(t, "NAME", u.ATOMIC) || "''", n = i.valueToCode(t, "DIR", u.ATOMIC) || "null", o = i.valueToCode(t, "DATA", u.ATOMIC) || "null", s = i.statementToCode(t, "HANDLE");
   return `{
   var res = __uploadResourceV1__(${e}, ${n}, ${o});
   var __success__ = res.success;
@@ -9031,11 +9024,11 @@ g([
   }
 ]);
 i.forBlock.text_v1 = function(t) {
-  return [i.quote_(t.getFieldValue("TEXT")), _.ATOMIC];
+  return [i.quote_(t.getFieldValue("TEXT")), u.ATOMIC];
 };
 const ba = /^\s*'([^']|\\')*'\s*$/;
 function se(t) {
-  return ba.test(t) ? [t, _.ATOMIC] : [`String(${t})`, _.FUNCTION_CALL];
+  return ba.test(t) ? [t, u.ATOMIC] : [`String(${t})`, u.FUNCTION_CALL];
 }
 U.register(
   "text_append_tooltip_v1",
@@ -9069,7 +9062,7 @@ i.forBlock.text_append_v1 = function(t) {
   const e = i.nameDB_?.getName(
     t.getFieldValue("VAR"),
     rt.NameType.VARIABLE
-  ), n = i.valueToCode(t, "TEXT", _.NONE) || "''";
+  ), n = i.valueToCode(t, "TEXT", u.NONE) || "''";
   return `${e} += ${se(n)};
 `;
 };
@@ -9107,7 +9100,7 @@ i.forBlock.text_change_case_v1 = function(t) {
   }[t.getFieldValue("CASE")], o = i.valueToCode(
     t,
     "TEXT",
-    n ? _.MEMBER : _.NONE
+    n ? u.MEMBER : u.NONE
   ) || "''";
   let s = "";
   return n ? s = o + n : s = i.provideFunction_(
@@ -9117,7 +9110,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(str) {
   return str.slice(0, 1).toUpperCase() + str.slice(1).toLowerCase();
 }
 `
-  ) + "(" + o + ")", [s, _.FUNCTION_CALL];
+  ) + "(" + o + ")", [s, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9143,8 +9136,8 @@ g([
   }
 ]);
 i.forBlock.text_char_at_v1 = function(t) {
-  const e = i.valueToCode(t, "VALUE", _.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
-  return [`${e}.charAt(${n})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "VALUE", u.MEMBER) || "[]", n = i.getAdjusted(t, "AT");
+  return [`${e}.charAt(${n})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9170,7 +9163,7 @@ g([
   }
 ]);
 i.forBlock.text_count_v1 = function(t) {
-  const e = i.valueToCode(t, "TEXT", _.NONE) || "''", n = i.valueToCode(t, "SUBSTR", _.NONE) || "''";
+  const e = i.valueToCode(t, "TEXT", u.NONE) || "''", n = i.valueToCode(t, "SUBSTR", u.NONE) || "''";
   return [`${i.provideFunction_(
     "textCount",
     `
@@ -9182,7 +9175,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle) {
   }
 }
 `
-  )}(${e}, ${n})`, _.FUNCTION_CALL];
+  )}(${e}, ${n})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9216,8 +9209,8 @@ g([
   }
 ]);
 i.forBlock.text_index_of_v1 = function(t) {
-  const e = t.getFieldValue("OP") === "FIRST" ? "indexOf" : "lastIndexOf", n = i.valueToCode(t, "TEXT", _.MEMBER) || "''", o = i.valueToCode(t, "SUBSTR", _.NONE) || "''";
-  return [`${n}.${e}(${o})`, _.FUNCTION_CALL];
+  const e = t.getFieldValue("OP") === "FIRST" ? "indexOf" : "lastIndexOf", n = i.valueToCode(t, "TEXT", u.MEMBER) || "''", o = i.valueToCode(t, "SUBSTR", u.NONE) || "''";
+  return [`${n}.${e}(${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9237,7 +9230,7 @@ g([
   }
 ]);
 i.forBlock.text_is_empty_v1 = function(t) {
-  return [`!${i.valueToCode(t, "VALUE", _.MEMBER) || "''"}.length`, _.LOGICAL_NOT];
+  return [`!${i.valueToCode(t, "VALUE", u.MEMBER) || "''"}.length`, u.LOGICAL_NOT];
 };
 const Pa = N.xml, Ra = {
   itemCount_: 0,
@@ -9359,20 +9352,20 @@ i.forBlock.text_join_v1 = function(t) {
   const e = t;
   switch (e.itemCount_) {
     case 0:
-      return ["''", _.ATOMIC];
+      return ["''", u.ATOMIC];
     case 1: {
-      const n = i.valueToCode(e, "ADD0", _.NONE) || "''";
+      const n = i.valueToCode(e, "ADD0", u.NONE) || "''";
       return se(n);
     }
     case 2: {
-      const n = i.valueToCode(e, "ADD0", _.NONE) || "''", o = i.valueToCode(e, "ADD1", _.NONE) || "''";
-      return [se(n)[0] + " + " + se(o)[0], _.ADDITION];
+      const n = i.valueToCode(e, "ADD0", u.NONE) || "''", o = i.valueToCode(e, "ADD1", u.NONE) || "''";
+      return [se(n)[0] + " + " + se(o)[0], u.ADDITION];
     }
     default: {
       const n = new Array(e.itemCount_);
       for (let s = 0; s < e.itemCount_; s++)
-        n[s] = i.valueToCode(e, "ADD" + s, _.NONE) || "''";
-      return ["[" + n.join(",") + "].join('')", _.FUNCTION_CALL];
+        n[s] = i.valueToCode(e, "ADD" + s, u.NONE) || "''";
+      return ["[" + n.join(",") + "].join('')", u.FUNCTION_CALL];
     }
   }
 };
@@ -9394,7 +9387,7 @@ g([
   }
 ]);
 i.forBlock.text_length_v1 = function(t) {
-  return [`${i.valueToCode(t, "VALUE", _.MEMBER) || "''"}.length`, _.MEMBER];
+  return [`${i.valueToCode(t, "VALUE", u.MEMBER) || "''"}.length`, u.MEMBER];
 };
 g([
   {
@@ -9425,7 +9418,7 @@ g([
   }
 ]);
 i.forBlock.text_replace_v1 = function(t) {
-  const e = i.valueToCode(t, "TEXT", _.NONE) || "''", n = i.valueToCode(t, "FROM", _.NONE) || "''", o = i.valueToCode(t, "TO", _.NONE) || "''";
+  const e = i.valueToCode(t, "TEXT", u.NONE) || "''", n = i.valueToCode(t, "FROM", u.NONE) || "''", o = i.valueToCode(t, "TO", u.NONE) || "''";
   return [`${i.provideFunction_(
     "textReplace",
     `
@@ -9435,7 +9428,7 @@ function ${i.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle, replacement) {
   return haystack.replace(new RegExp(needle, 'g'), replacement);
 }
 `
-  )}(${e}, ${n}, ${o})`, _.FUNCTION_CALL];
+  )}(${e}, ${n}, ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9456,7 +9449,7 @@ g([
   }
 ]);
 i.forBlock.text_reverse_v1 = function(t) {
-  return [(i.valueToCode(t, "TEXT", _.MEMBER) || "''") + ".split('').reverse().join('')", _.FUNCTION_CALL];
+  return [(i.valueToCode(t, "TEXT", u.MEMBER) || "''") + ".split('').reverse().join('')", u.FUNCTION_CALL];
 };
 g([
   {
@@ -9482,8 +9475,8 @@ g([
   }
 ]);
 i.forBlock.text_split_v1 = function(t) {
-  const e = i.valueToCode(t, "TEXT", _.MEMBER) || "''", n = i.valueToCode(t, "DELIM", _.NONE) || "''";
-  return [`${e}.split(${n})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "TEXT", u.MEMBER) || "''", n = i.valueToCode(t, "DELIM", u.NONE) || "''";
+  return [`${e}.split(${n})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9514,8 +9507,8 @@ g([
   }
 ]);
 i.forBlock.text_substring_v1 = function(t) {
-  const e = i.valueToCode(t, "TEXT", _.MEMBER) || "''", n = i.getAdjusted(t, "START"), o = i.getAdjusted(t, "END", 1);
-  return [`${e}.slice(${n}, ${o})`, _.FUNCTION_CALL];
+  const e = i.valueToCode(t, "TEXT", u.MEMBER) || "''", n = i.getAdjusted(t, "START"), o = i.getAdjusted(t, "END", 1);
+  return [`${e}.slice(${n}, ${o})`, u.FUNCTION_CALL];
 };
 g([
   {
@@ -9544,12 +9537,12 @@ g([
   }
 ]);
 i.forBlock.text_trim_v1 = function(t) {
-  const e = i.valueToCode(t, "TEXT", _.NONE) || "''", o = {
+  const e = i.valueToCode(t, "TEXT", u.NONE) || "''", o = {
     BOTH: 0,
     LEFT: 1,
     RIGHT: 2
   }[t.getFieldValue("MODE")];
-  return [`__trimV1__(${e}, ${o})`, _.ATOMIC];
+  return [`__trimV1__(${e}, ${o})`, u.ATOMIC];
 };
 const Ma = {
   init: function() {
@@ -9579,7 +9572,7 @@ const Ma = {
 };
 A.create_timer_v1 = Ma;
 i.forBlock.create_timer_v1 = function(t) {
-  const e = i.valueToCode(t, "INTERVAL", _.ATOMIC) || "1000", n = i.valueToCode(t, "LOOP", _.ATOMIC) || "false", o = i.valueToCode(t, "COUNT", _.ATOMIC) || "1", s = i.valueToCode(t, "IMMEDIATE", _.ATOMIC) || "false", a = i.statementToCode(t, "CALLBACK");
+  const e = i.valueToCode(t, "INTERVAL", u.ATOMIC) || "1000", n = i.valueToCode(t, "LOOP", u.ATOMIC) || "false", o = i.valueToCode(t, "COUNT", u.ATOMIC) || "1", s = i.valueToCode(t, "IMMEDIATE", u.ATOMIC) || "false", a = i.statementToCode(t, "CALLBACK");
   return `__createTimerV1__(${e}, ${n}, ${o}, ${s}, async function() {
 ${a}});
 `;
@@ -9603,7 +9596,7 @@ g([
   }
 ]);
 i.forBlock.delay_v1 = function(t) {
-  return `await __delayV1__(${i.valueToCode(t, "DURATION", _.ATOMIC) || "0"});
+  return `await __delayV1__(${i.valueToCode(t, "DURATION", u.ATOMIC) || "0"});
 `;
 };
 const Ua = {
@@ -9671,7 +9664,7 @@ i.forBlock.variable_get_v1 = function(t) {
   return [i.nameDB_.getName(
     t.getFieldValue("VAR"),
     rt.NameType.VARIABLE
-  ), _.ATOMIC];
+  ), u.ATOMIC];
 };
 g([
   {
@@ -9700,7 +9693,7 @@ i.forBlock.variable_set_v1 = function(t) {
   const e = i.nameDB_.getName(
     t.getFieldValue("VAR"),
     rt.NameType.VARIABLE
-  ), n = i.valueToCode(t, "VALUE", _.ASSIGNMENT) || "0";
+  ), n = i.valueToCode(t, "VALUE", u.ASSIGNMENT) || "0";
   return `${e} = ${n};
 `;
 };
@@ -9778,18 +9771,18 @@ wo.prototype.cleanUp = function() {
   const e = this.getTopBlocks(!0), n = e.filter((c) => c.isMovable()), s = e.filter((c) => !c.isMovable()).map(
     (c) => c.getBoundingRectangle()
   ), a = function(c) {
-    for (const l of s)
-      if (c.intersects(l))
-        return l;
+    for (const _ of s)
+      if (c.intersects(_))
+        return _;
     return null;
   };
   let r = 0;
   for (const c of n) {
-    let l = c.getBoundingRectangle();
-    c.moveBy(-l.left, r - l.top, ["cleanup"]), c.snapToGrid(), l = c.getBoundingRectangle();
-    let d = a(l);
+    let _ = c.getBoundingRectangle();
+    c.moveBy(-_.left, r - _.top, ["cleanup"]), c.snapToGrid(), _ = c.getBoundingRectangle();
+    let d = a(_);
     for (; d != null; )
-      r = d.top + d.getHeight() + Fn, c.moveBy(0, r - l.top, ["cleanup"]), c.snapToGrid(), l = c.getBoundingRectangle(), d = a(l);
+      r = d.top + d.getHeight() + Fn, c.moveBy(0, r - _.top, ["cleanup"]), c.snapToGrid(), _ = c.getBoundingRectangle(), d = a(_);
     r = c.getRelativeToSurfaceXY().y + c.getHeightWidth().height + Fn;
   }
   O.setGroup(t), this.setResizesEnabled(!0);
@@ -10095,7 +10088,7 @@ function qa(t) {
       const s = o.getInputTargetBlock("OBJECT"), a = i.valueToCode(
         o,
         "KEY",
-        _.ATOMIC
+        u.ATOMIC
       );
       if (s.type === "get_app_property_v1") {
         const r = s;
@@ -10156,7 +10149,7 @@ function Qa(t) {
     }
   return e;
 }
-const Oo = Symbol();
+const Oo = /* @__PURE__ */ Symbol();
 function za(t) {
   ps(Oo, t);
 }
@@ -10179,10 +10172,10 @@ const Za = /* @__PURE__ */ pt({
         return;
       }
       a.workspace.cleanUp();
-    }, l = () => {
+    }, _ = () => {
       c();
     };
-    return e({ cleanWorkspace: c }), (d, u) => {
+    return e({ cleanWorkspace: c }), (d, l) => {
       const h = F("v-btn"), p = F("v-tooltip");
       return M(), ut(p, {
         disabled: r.value,
@@ -10193,7 +10186,7 @@ const Za = /* @__PURE__ */ pt({
             density: "comfortable",
             icon: "mdi-broom",
             variant: "outlined",
-            onClick: l
+            onClick: _
           }), null, 16)
         ]),
         _: 1
@@ -10210,8 +10203,8 @@ const Za = /* @__PURE__ */ pt({
   setup(t) {
     const { t: e } = Qt(), n = _n(), o = Ht(t, "modelValue"), s = $(() => n.smAndDown.value);
     return (a, r) => {
-      const c = F("v-btn"), l = F("v-tooltip");
-      return M(), ut(l, {
+      const c = F("v-btn"), _ = F("v-tooltip");
+      return M(), ut(_, {
         disabled: s.value,
         text: Y(e)("x-block-lib.tip.hotkeyCtrlW")
       }, {
@@ -10220,7 +10213,7 @@ const Za = /* @__PURE__ */ pt({
             density: "comfortable",
             icon: o.value ? "mdi-lock" : "mdi-lock-open",
             variant: "outlined",
-            onClick: r[0] || (r[0] = (u) => o.value = !o.value)
+            onClick: r[0] || (r[0] = (l) => o.value = !o.value)
           }), null, 16, ["icon"])
         ]),
         _: 1
@@ -10241,7 +10234,7 @@ const Za = /* @__PURE__ */ pt({
   },
   emits: ["x-click"],
   setup(t, { emit: e }) {
-    const { primaryColor: n, backgroundColor2: o, highlightColor: s } = Jt(), a = t, r = e, c = Pt(!1), l = $(() => ({
+    const { primaryColor: n, backgroundColor2: o, highlightColor: s } = Jt(), a = t, r = e, c = Pt(!1), _ = $(() => ({
       position: "relative",
       background: c.value ? s.value : o.value,
       width: "100%",
@@ -10258,11 +10251,11 @@ const Za = /* @__PURE__ */ pt({
       border: "1px solid " + n.value,
       pointerEvents: "none"
     }));
-    return (u, h) => {
+    return (l, h) => {
       const p = F("v-spacer"), f = F("v-icon"), T = hs("ripple");
       return fs((M(), it("div", {
         class: "d-flex align-center cursor-pointer",
-        style: z(l.value),
+        style: z(_.value),
         onClick: h[1] || (h[1] = (E) => r("x-click", a.id)),
         onMouseout: h[2] || (h[2] = (E) => c.value = !1),
         onMouseover: h[3] || (h[3] = (E) => c.value = !0)
@@ -10330,7 +10323,7 @@ const Za = /* @__PURE__ */ pt({
       }), a.value = p;
     } });
     let c = [];
-    const l = () => {
+    const _ = () => {
       if (t.lock) {
         Xn(n("x-block-lib.msg.cannotOperateInLockedState"));
         return;
@@ -10339,7 +10332,7 @@ const Za = /* @__PURE__ */ pt({
       a.value.forEach(({ id: f }) => {
         p.push(f);
       }), c = p;
-    }, d = () => !t.lock, u = (p) => {
+    }, d = () => !t.lock, l = (p) => {
       if (!s.workspace) {
         console.assert(!1);
         return;
@@ -10380,9 +10373,9 @@ const Za = /* @__PURE__ */ pt({
       animation: 150,
       "ghost-class": "ghost",
       handle: ".x-handle",
-      onEnd: u,
+      onEnd: l,
       onMove: d,
-      onStart: l
+      onStart: _
     }, {
       default: lt(() => [
         (M(!0), it(to, null, ms(a.value, (T) => (M(), ut(sc, {
@@ -10423,11 +10416,11 @@ const Za = /* @__PURE__ */ pt({
         console.assert(!1);
         return;
       }
-      const l = c.getBlockById(r);
-      jn.setSelected(l), fn(r), n.value = !1;
+      const _ = c.getBlockById(r);
+      jn.setSelected(_), fn(r), n.value = !1;
     };
     return (r, c) => (M(), it("div", {
-      onClick: c[0] || (c[0] = (l) => a(""))
+      onClick: c[0] || (c[0] = (_) => a(""))
     }, "blockTree"));
   }
 }), lc = { class: "text-subtitle-1" }, _c = /* @__PURE__ */ pt({
@@ -10444,7 +10437,7 @@ const Za = /* @__PURE__ */ pt({
         width: T,
         height: "100%"
       };
-    }), l = $(() => {
+    }), _ = $(() => {
       let T = 48;
       return s.value && (T += 24), {
         position: "relative",
@@ -10452,31 +10445,31 @@ const Za = /* @__PURE__ */ pt({
       };
     }), d = $(() => ({
       height: "60px"
-    })), { open: u } = rn(`blocklyNavigatorDlg${Ze()}`);
+    })), { open: l } = rn(`blocklyNavigatorDlg${Ze()}`);
     Ts(() => {
-      u.value = !1;
+      l.value = !1;
     });
     const h = $t("blockList"), p = $t("blockTree");
-    return e({ open: u, update: () => {
+    return e({ open: l, update: () => {
       t.type === "list" ? h.value?.update() : t.type === "tree" && p.value?.update();
     } }), (T, E) => {
       const y = F("v-sheet"), k = F("v-btn"), R = F("v-spacer"), Lt = F("v-dialog"), Ve = F("v-tooltip");
       return M(), it(to, null, [
         D(Lt, {
-          modelValue: Y(u),
-          "onUpdate:modelValue": E[5] || (E[5] = (Q) => oe(u) ? u.value = Q : null),
+          modelValue: Y(l),
+          "onUpdate:modelValue": E[5] || (E[5] = (Q) => oe(l) ? l.value = Q : null),
           eager: "",
           fullscreen: "",
           "no-click-animation": "",
           persistent: "",
           transition: "scroll-x-reverse-transition",
-          onKeydown: E[6] || (E[6] = eo(Kt((Q) => u.value = !1, ["stop", "prevent"]), ["esc"]))
+          onKeydown: E[6] || (E[6] = eo(Kt((Q) => l.value = !1, ["stop", "prevent"]), ["esc"]))
         }, {
           default: lt(() => [
             X("div", {
               class: "w-100 h-100 d-flex flex-row-reverse",
-              onClick: E[3] || (E[3] = Kt((Q) => u.value = !1, ["self"])),
-              onContextmenu: E[4] || (E[4] = Kt((Q) => u.value = !1, ["self", "prevent"]))
+              onClick: E[3] || (E[3] = Kt((Q) => l.value = !1, ["self"])),
+              onContextmenu: E[4] || (E[4] = Kt((Q) => l.value = !1, ["self", "prevent"]))
             }, [
               X("div", {
                 class: "elevation-2",
@@ -10497,7 +10490,7 @@ const Za = /* @__PURE__ */ pt({
                       density: "comfortable",
                       icon: "mdi-close",
                       variant: "text",
-                      onClick: E[0] || (E[0] = (Q) => u.value = !1)
+                      onClick: E[0] || (E[0] = (Q) => l.value = !1)
                     }),
                     X("span", lc, Gt(Y(n)("x-block-lib.navigator")), 1),
                     D(R)
@@ -10506,21 +10499,21 @@ const Za = /* @__PURE__ */ pt({
                 }),
                 X("div", {
                   class: "overflow-y-auto",
-                  style: z(l.value)
+                  style: z(_.value)
                 }, [
                   t.type === "list" ? (M(), ut(rc, {
                     key: 0,
                     ref_key: "blockList",
                     ref: h,
-                    modelValue: Y(u),
-                    "onUpdate:modelValue": E[1] || (E[1] = (Q) => oe(u) ? u.value = Q : null),
+                    modelValue: Y(l),
+                    "onUpdate:modelValue": E[1] || (E[1] = (Q) => oe(l) ? l.value = Q : null),
                     lock: t.lock
                   }, null, 8, ["modelValue", "lock"])) : t.type === "tree" ? (M(), ut(uc, {
                     key: 1,
                     ref_key: "blockTree",
                     ref: p,
-                    modelValue: Y(u),
-                    "onUpdate:modelValue": E[2] || (E[2] = (Q) => oe(u) ? u.value = Q : null)
+                    modelValue: Y(l),
+                    "onUpdate:modelValue": E[2] || (E[2] = (Q) => oe(l) ? l.value = Q : null)
                   }, null, 8, ["modelValue"])) : dt("", !0),
                   X("div", {
                     style: z(d.value)
@@ -10540,7 +10533,7 @@ const Za = /* @__PURE__ */ pt({
               density: "comfortable",
               icon: "mdi-navigation-variant",
               variant: "outlined",
-              onClick: E[7] || (E[7] = (Tn) => u.value = !0)
+              onClick: E[7] || (E[7] = (Tn) => l.value = !0)
             }), null, 16)
           ]),
           _: 1
@@ -11747,7 +11740,11 @@ const Ie = { name: "COMPUTE_MISC_CATEGORY", callback: Pc }, Be = {
 function xc(t, e, n, o) {
   We.theme = o ? "dark" : "light", We.toolbox = Yc(e, n);
   const s = Jo(t, We);
-  return s.addChangeListener(qo.shadowBlockConversionChangeListener), Fc(s, e, n), wc(s), s;
+  return s.addChangeListener((a) => {
+    setTimeout(() => {
+      qo.shadowBlockConversionChangeListener(a);
+    }, 0);
+  }), Fc(s, e, n), wc(s), s;
 }
 function Yc(t, e) {
   let n;
@@ -11787,32 +11784,32 @@ function Kc(t, e) {
     if (s instanceof Array)
       r = "json_array_v1";
     else {
-      const l = typeof s;
-      if (l === "object")
+      const _ = typeof s;
+      if (_ === "object")
         r = "json_map_v1";
-      else if (l === "string")
+      else if (_ === "string")
         r = "json_string_v1";
-      else if (l === "number")
+      else if (_ === "number")
         r = "json_number_v1";
-      else if (l === "boolean")
+      else if (_ === "boolean")
         r = "json_boolean_v1";
       else
         return;
     }
     const c = e.newBlock(r);
     if (c.initSvg(), c.render(), a.connect(c.outputConnection), r === "json_map_v1") {
-      const l = [];
+      const _ = [];
       for (const d in s)
-        l.push(d);
-      c.initData(l);
-      for (let d = 0; d < l.length; d++) {
-        const u = l[d], h = c.getInput("ENTRY" + d);
-        o(s[u], h.connection);
+        _.push(d);
+      c.initData(_);
+      for (let d = 0; d < _.length; d++) {
+        const l = _[d], h = c.getInput("ENTRY" + d);
+        o(s[l], h.connection);
       }
     } else if (r === "json_array_v1") {
       c.initData(s.length);
-      for (let l = 0; l < s.length; l++)
-        o(s[l], c.getInput("ENTRY" + l).connection);
+      for (let _ = 0; _ < s.length; _++)
+        o(s[_], c.getInput("ENTRY" + _).connection);
     } else r === "json_string_v1" || r === "json_number_v1" ? c.setFieldValue(s, "VALUE") : r === "json_boolean_v1" && c.setFieldValue(s ? "true" : "false", "VALUE");
   };
   o(t, n.getInput("JSON").connection), O.fire(
@@ -11866,7 +11863,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
   }),
   emits: /* @__PURE__ */ ze(["ready"], ["update:lock", "update:scale"]),
   setup(t, { expose: e, emit: n }) {
-    const { backgroundColor2: o } = Jt(), s = Ht(t, "lock"), a = Ht(t, "scale"), r = n, c = `blocklyEditor${Ze()}`, l = Pt(), d = $t("parentContainer"), u = $t("clean"), h = $t("navigator"), p = {};
+    const { backgroundColor2: o } = Jt(), s = Ht(t, "lock"), a = Ht(t, "scale"), r = n, c = `blocklyEditor${Ze()}`, _ = Pt(), d = $t("parentContainer"), l = $t("clean"), h = $t("navigator"), p = {};
     za(p);
     const f = Pt(!0), T = Pt(!1), E = $(() => t.type === "json" ? "tree" : "list"), y = $(() => ({
       width: "100%",
@@ -11913,11 +11910,11 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
       zIndex: 3e3
     })), { open: xt } = rn(`blocklyEditorFlyout${Ze()}`);
     Nn(async () => {
-      if (!l.value || !d.value) {
+      if (!_.value || !d.value) {
         console.assert(!1);
         return;
       }
-      Qo(d.value), await Bn(t.locale), p.workspace = xc(l.value, t.type, t.version, t.dark), p.workspace.addChangeListener(O.disableOrphans), p.workspace.addChangeListener(No);
+      Qo(d.value), await Bn(t.locale), p.workspace = xc(_.value, t.type, t.version, t.dark), p.workspace.addChangeListener(O.disableOrphans), p.workspace.addChangeListener(No);
       const b = document.querySelector(`#${c} .blocklyFlyout`);
       new MutationObserver((xe) => {
         xe.forEach((ee) => {
@@ -11926,7 +11923,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
       }).observe(b, { attributes: !0 }), xt.value = p.workspace.getFlyout().isVisible(), En(), gn(), await Es(), r("ready");
     }), Ln(() => {
       xt.value = !1;
-    }), zo(l, () => {
+    }), zo(_, () => {
       p.workspace && Zo(p.workspace);
     });
     async function No(b) {
@@ -11960,7 +11957,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
     }, Ro = () => {
       p.workspace.fireChangeListener(new no());
     }, An = () => {
-      u.value?.cleanWorkspace();
+      l.value?.cleanWorkspace();
     }, In = () => {
       s.value = !s.value;
     }, yn = () => {
@@ -11999,7 +11996,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
         X("div", {
           id: c,
           ref_key: "blocklyDiv",
-          ref: l,
+          ref: _,
           style: z(y.value)
         }, null, 4),
         X("div", {
@@ -12024,7 +12021,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
         }, [
           D(Za, {
             ref_key: "clean",
-            ref: u,
+            ref: l,
             lock: s.value
           }, null, 8, ["lock"]),
           D(tc, {
@@ -12095,17 +12092,17 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
       };
     }), c = (d) => {
       a.value = d.code;
-    }, { open: l } = rn("sourceDlg", c);
-    return (d, u) => {
+    }, { open: _ } = rn("sourceDlg", c);
+    return (d, l) => {
       const h = F("v-sheet"), p = F("v-btn"), f = F("v-spacer"), T = F("v-dialog");
       return M(), ut(T, {
-        modelValue: Y(l),
-        "onUpdate:modelValue": u[1] || (u[1] = (E) => oe(l) ? l.value = E : null),
+        modelValue: Y(_),
+        "onUpdate:modelValue": l[1] || (l[1] = (E) => oe(_) ? _.value = E : null),
         fullscreen: "",
         "no-click-animation": "",
         persistent: "",
         transition: "dialog-bottom-transition",
-        onKeydown: u[2] || (u[2] = eo(Kt((E) => l.value = !1, ["stop", "prevent"]), ["esc"]))
+        onKeydown: l[2] || (l[2] = eo(Kt((E) => _.value = !1, ["stop", "prevent"]), ["esc"]))
       }, {
         default: lt(() => [
           D(h, {
@@ -12129,7 +12126,7 @@ const Hc = { class: "position-relative w-100 h-100" }, Gc = /* @__PURE__ */ pt({
                     density: "comfortable",
                     icon: "mdi-close",
                     variant: "text",
-                    onClick: u[0] || (u[0] = (E) => l.value = !1)
+                    onClick: l[0] || (l[0] = (E) => _.value = !1)
                   }),
                   X("span", jc, Gt(Y(e)("x-block-lib.dlg.source.title")), 1),
                   D(f)