x-block-lib 0.8.64 → 0.8.65

package/dist/core/utils/app/app.d.ts

@@ -6,18 +6,4 @@ interface AppInfo {
 export declare function getAllAppInfos(): AppInfo[];
 export declare function getAppInfo(appId: string): AppInfo | undefined;
 export declare function genAppOpts(): Blockly.MenuOption[];
-interface PageInfo {
-    id: string;
-    name: string;
-}
-export declare function getAllPageInfos(appId: string): PageInfo[];
-export declare function getPageInfo(appId: string, pageId: string): PageInfo | undefined;
-export declare function genPageOpts(appId: string): Blockly.MenuOption[];
-interface CompInfo {
-    id: string;
-    name: string;
-}
-export declare function getAllCompInfos(): CompInfo[];
-export declare function getCompInfo(compId: string): CompInfo | undefined;
-export declare function genCompOpts(): Blockly.MenuOption[];
 export {};

package/dist/core/utils/app/comp.d.ts

@@ -0,0 +1,9 @@
+import * as Blockly from 'blockly/core';
+interface CompInfo {
+    id: string;
+    name: string;
+}
+export declare function getAllCompInfos(): CompInfo[];
+export declare function getCompInfo(compId: string): CompInfo | undefined;
+export declare function genCompOpts(): Blockly.MenuOption[];
+export {};

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

@@ -1,8 +1,10 @@
 export * from './app';
 export * from './argument';
+export * from './comp';
 export * from './event';
 export * from './method';
 export * from './node';
+export * from './page';
 export * from './property';
 export * from './slot';
 export * from './state';

package/dist/core/utils/app/page.d.ts

@@ -0,0 +1,9 @@
+import * as Blockly from 'blockly/core';
+interface PageInfo {
+    id: string;
+    name: string;
+}
+export declare function getAllPageInfos(appId: string): PageInfo[];
+export declare function getPageInfo(appId: string, pageId: string): PageInfo | undefined;
+export declare function genPageOpts(appId: string): Blockly.MenuOption[];
+export {};

package/dist/index.js

@@ -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,7 +572,7 @@ 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;
@@ -834,7 +809,7 @@ 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);
@@ -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;
@@ -1254,7 +1229,7 @@ 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);
@@ -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);
@@ -1448,23 +1423,23 @@ 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;
@@ -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,7 +1513,7 @@ 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: _ } of o[t.key][e])
@@ -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);
@@ -1618,6 +1593,31 @@ 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)
@@ -1676,9 +1676,7 @@ function Wt(t, e) {
         }
       });
   if (io(d.key) && _.slot && o.type === "comp" && s.meta.slots) {
-    const l = s.meta.slots.find(
-      (h) => h.id === _.slot
-    );
+    const l = s.meta.slots.find((h) => h.id === _.slot);
     if (l && l.properties)
       for (const h of l.properties)
         r.push({
@@ -1831,9 +1829,7 @@ function Nt(t) {
     }
   } else if (r === "customSlotProperty") {
     if (io(l.key) && d.slot && n.type === "comp" && o.meta.slots) {
-      const h = o.meta.slots.find(
-        (p) => p.id === d.slot
-      );
+      const h = o.meta.slots.find((p) => p.id === d.slot);
       if (h && h.properties) {
         const p = h.properties.find((f) => f.id === _);
         if (p)
@@ -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)
@@ -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;
@@ -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
     );
@@ -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,7 +2983,7 @@ const ai = {
 };
 A.select_comp_v1 = ai;
 i.forBlock.select_comp_v1 = function(t) {
-  const e = i.quote_, o = t.comp.id ?? "";
+  const e = i.quote_, o = t.comp.id;
   return [e(o), u.ATOMIC];
 };
 const ci = {
@@ -3045,7 +3041,7 @@ const ci = {
 };
 A.select_slot_v1 = ci;
 i.forBlock.select_slot_v1 = function(t) {
-  const e = i.quote_, o = t.slot.id ?? "";
+  const e = i.quote_, o = t.slot.id;
   return [e(o), u.ATOMIC];
 };
 const ri = {
@@ -11744,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;

package/package.json

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