@milaboratories/pl-middle-layer 1.33.3 → 1.34.0

package/dist/index.mjs

@@ -34,13 +34,13 @@ export * from "@milaboratories/pl-deployments";
 import { request as At, RetryAgent as Vs } from "undici";
 import { RegistryV1 as ue, tryLoadPackDescription as wt, BlockPackMetaEmbedAbsoluteBytes as Us, RegistryV2Reader as Gs, folderReaderByUrl as Js, loadPackDescription as Zt } from "@platforma-sdk/block-tools";
 import Q from "node:fs";
-import M from "node:path";
+import _ from "node:path";
 import Ms from "yaml";
-import { assertNever as _, notEmpty as x, ConsoleLoggerAdapter as _s, HmacSha256Signer as Wr } from "@milaboratories/ts-helpers";
+import { assertNever as K, notEmpty as j, ConsoleLoggerAdapter as _s, HmacSha256Signer as Wr } from "@milaboratories/ts-helpers";
 import * as qr from "node:fs/promises";
 import er from "node:fs/promises";
 import { tryResolve as Ks } from "@milaboratories/resolve-helper";
-import { resourceTypesEqual as ae, field as j, Pl as A, PlClient as Hs, isNullResourceId as Ye, ensureResourceIdNotNull as St, isResource as Ws, isResourceRef as qs, isNotNullResourceId as tr, resourceType as De, resourceTypeToString as zs, stringifyWithResourceId as xe, resourceIdToString as ve, isNotFoundError as Xs, isTimeoutOrCancelError as Ys, toGlobalResourceId as Qs, plAddressToConfig as Zs, UnauthenticatedPlClient as rr } from "@milaboratories/pl-client";
+import { resourceTypesEqual as ae, field as V, Pl as A, PlClient as Hs, isNullResourceId as Ye, ensureResourceIdNotNull as St, isResource as Ws, isResourceRef as qs, isNotNullResourceId as tr, resourceType as De, resourceTypeToString as zs, stringifyWithResourceId as xe, resourceIdToString as ve, isNotFoundError as Xs, isTimeoutOrCancelError as Ys, toGlobalResourceId as Qs, plAddressToConfig as Zs, UnauthenticatedPlClient as rr } from "@milaboratories/pl-client";
 export * from "@milaboratories/pl-client";
 import { SynchronizedTreeState as zr, treeDumpStats as eo, isPlTreeNodeAccessor as to } from "@milaboratories/pl-tree";
 import { Computable as J, ChangeSource as sr, PollComputablePool as ro, WatchableValue as so } from "@milaboratories/computable";
@@ -75,7 +75,7 @@ const ko = [ue.PlPackageYamlConfigFile], Po = [ue.PlPackageJsonConfigFile], Tt =
   Zr
 ];
 async function Io(s) {
-  return await or(M.join(s, ...Lt)) !== void 0 || await or(M.join(s, ...Tt)) !== void 0;
+  return await or(_.join(s, ...Lt)) !== void 0 || await or(_.join(s, ...Tt)) !== void 0;
 }
 function lt(s, e) {
   const t = Ks(s, e);
@@ -83,15 +83,15 @@ function lt(s, e) {
   return t;
 }
 async function ir(s, e) {
-  if (M.isAbsolute(s) || (s = M.resolve(s)), await Io(s))
+  if (_.isAbsolute(s) || (s = _.resolve(s)), await Io(s))
     return {
-      workflow: M.join(s, ...Tt),
-      config: M.join(s, ...Lt),
-      ui: M.join(s, ...Zr)
+      workflow: _.join(s, ...Tt),
+      config: _.join(s, ...Lt),
+      ui: _.join(s, ...Zr)
     };
   {
     const t = lt(s, nr), r = lt(s, nr), o = lt(s, Oo);
-    return { workflow: t, config: r, ui: M.resolve(o, "..", "dist") };
+    return { workflow: t, config: r, ui: _.resolve(o, "..", "dist") };
   }
 }
 async function Fo(s) {
@@ -115,7 +115,7 @@ async function Ao(s) {
 async function es(s) {
   let e = 0n;
   for (const t of $o) {
-    const r = M.join(s, ...t), o = await Ao(r);
+    const r = _.join(s, ...t), o = await Ao(r);
     o !== void 0 && e < o.mtimeNs && (e = o.mtimeNs);
   }
   return e.toString();
@@ -139,12 +139,12 @@ class pu {
           o
         )).body.json();
         for (const a of i) {
-          const { organization: c, package: u, latestMeta: l, latestVersion: d } = a, f = {
+          const { organization: c, package: u, latestMeta: l, latestVersion: d } = a, h = {
             organization: c,
             name: u,
             version: d
-          }, h = {
-            id: f,
+          }, f = {
+            id: h,
             meta: {
               title: l.title ?? "No title",
               description: l.description ?? "No Description",
@@ -155,18 +155,18 @@ class pu {
             },
             spec: {
               type: "from-registry-v1",
-              id: f,
+              id: h,
               registryUrl: r.url
             }
           };
           t.push({
             registryId: e.id,
-            id: f,
+            id: h,
             latestByChannel: {
-              [Pe]: h,
-              [Oe]: h
+              [Pe]: f,
+              [Oe]: f
             },
-            allVersions: a.allVersions.map((E) => ({ version: E, channels: [] }))
+            allVersions: a.allVersions.map((R) => ({ version: R, channels: [] }))
           });
         }
         return t;
@@ -176,8 +176,8 @@ class pu {
       case "local-dev":
         for (const o of await Q.promises.readdir(r.path, { withFileTypes: !0 })) {
           if (!o.isDirectory()) continue;
-          const n = M.join(r.path, o.name), i = await Fo(
-            M.join(n, ue.PlPackageYamlConfigFile)
+          const n = _.join(r.path, o.name), i = await Fo(
+            _.join(n, ue.PlPackageYamlConfigFile)
           );
           if (i !== void 0) {
             const a = ue.PlPackageConfigData.parse(Ms.parse(i)), c = await es(n), u = {
@@ -213,7 +213,7 @@ class pu {
             let a = n, c = await wt(a);
             if (c === void 0) {
               for (const u of ["block", "meta"])
-                if (a = M.join(n, u), c = await wt(a), c !== void 0) break;
+                if (a = _.join(n, u), c = await wt(a), c !== void 0) break;
             }
             if (c !== void 0) {
               const u = await Dt(c), l = {
@@ -239,7 +239,7 @@ class pu {
         }
         return t;
       default:
-        return _(r);
+        return K(r);
     }
   }
   async listBlockPacks() {
@@ -333,14 +333,14 @@ async function Ho(s, e, t, r) {
     for (const l of a.listDynamicFields()) {
       const d = a.traverse(l);
       if (d === void 0) continue;
-      const f = x(d.getKeyValueAsJson(Le)), h = x(d.getKeyValueAsJson(Nt)), E = x(d.getKeyValueAsJson(Te));
+      const h = j(d.getKeyValueAsJson(Le)), f = j(d.getKeyValueAsJson(Nt)), R = j(d.getKeyValueAsJson(Te));
       u.push({
         id: l,
         rid: d.id,
-        created: new Date(h),
-        lastModified: new Date(E),
+        created: new Date(f),
+        lastModified: new Date(R),
         opened: c.indexOf(d.id) >= 0,
-        meta: f
+        meta: h
       });
     }
     return u.sort((l) => -l.lastModified.valueOf()), u;
@@ -355,7 +355,7 @@ const Wo = {
 };
 function os(s, e, t, r, o) {
   if (o.length === 0) throw new Error("Zero output names provided");
-  const n = t ? s.createEphemeral(Wo) : s.createStruct(qo), i = j(n, "template"), a = j(n, "inputs");
+  const n = t ? s.createEphemeral(Wo) : s.createStruct(qo), i = V(n, "template"), a = V(n, "inputs");
   return s.createField(i, "Input", e), s.createField(a, "Input", A.createPlMap(s, r, t)), s.lockInputs(n), A.futureRecord(s, n, o, "Output", "outputs/");
 }
 const zo = { name: "BContextEnd", version: "1" }, Xo = { name: "BContext", version: "1" }, Yo = "id", Qo = "parent/", Zo = ["context", "result"];
@@ -370,9 +370,9 @@ function cr(s, e) {
   if (e.length === 0) return en(s);
   if (e.length === 1) return e[0];
   const t = s.createEphemeral(Xo);
-  s.createField(j(t, Yo), "Input", A.createPlString(s, ye()));
+  s.createField(V(t, Yo), "Input", A.createPlString(s, ye()));
   for (let r = 0; r < e.length; r++)
-    s.createField(j(t, `${Qo}${r}`), "Input", e[r]);
+    s.createField(V(t, `${Qo}${r}`), "Input", e[r]);
   return s.lock(t), t;
 }
 function tn(s, e) {
@@ -381,7 +381,7 @@ function tn(s, e) {
     case "pl.tengo-template.v2":
       return is(s, t);
     default:
-      _(r);
+      K(r);
   }
 }
 function rn(s, e) {
@@ -390,7 +390,7 @@ function rn(s, e) {
     case "pl.tengo-template.v2":
       return is(s, t);
     default:
-      _(r);
+      K(r);
   }
 }
 const lr = {
@@ -483,11 +483,11 @@ async function cn(s) {
     case "prepared":
       return s;
     default:
-      return _(s);
+      return K(s);
   }
 }
 function ln(s, e) {
-  const t = s.createStruct(sn), r = j(t, on), o = j(t, nn), n = j(t, an);
+  const t = s.createStruct(sn), r = V(t, on), o = V(t, nn), n = V(t, an);
   return s.setField(r, s.createValue(A.JsonString, Buffer.from(JSON.stringify(e.registry)))), s.setField(o, s.createValue(A.JsonString, Buffer.from(JSON.stringify(e.path)))), n;
 }
 function Bt(s, e) {
@@ -499,7 +499,7 @@ function Bt(s, e) {
     case "prepared":
       return rn(s, e);
     default:
-      return _(e);
+      return K(e);
   }
 }
 const as = { name: "Frontend/FromUrl", version: "1" }, cs = {
@@ -522,7 +522,7 @@ function un(s, e) {
         })
       );
     default:
-      return _(e);
+      return K(e);
   }
 }
 class dn {
@@ -530,7 +530,7 @@ class dn {
     w(this, "nextMessageId", 0);
     w(this, "worker");
     w(this, "pendingRequests", /* @__PURE__ */ new Map());
-    const e = typeof global < "u" && "__WORKER_PATH__" in global ? global.__WORKER_PATH__ : M.resolve(import.meta.dirname, "worker.js"), t = this.worker = new no(
+    const e = typeof global < "u" && "__WORKER_PATH__" in global ? global.__WORKER_PATH__ : _.resolve(import.meta.dirname, "worker.js"), t = this.worker = new no(
       e,
       {
         workerData: {}
@@ -609,7 +609,7 @@ class fn {
         return Ue(o);
       }
       default:
-        return _(e);
+        return K(e);
     }
   }
   async prepare(e) {
@@ -713,20 +713,20 @@ class fn {
         };
       }
       default:
-        return _(e);
+        return K(e);
     }
   }
 }
 function gn(s, e) {
   const t = { config: e.config, source: e.source }, r = s.createStruct(pn, JSON.stringify(t));
-  return s.createField(j(r, ls), "Input", Bt(s, e.template)), s.createField(j(r, us), "Input", un(s, e.frontend)), s.lock(r), r;
+  return s.createField(V(r, ls), "Input", Bt(s, e.template)), s.createField(V(r, us), "Input", un(s, e.frontend)), s.lock(r), r;
 }
 function dr(s, e) {
   switch (e.type) {
     case "prepared":
       return gn(s, e);
     default:
-      return _(e.type);
+      return K(e.type);
   }
 }
 function Ge(s, e) {
@@ -757,7 +757,7 @@ function Pt(s, e, t) {
           Pt(s, o, t);
       return;
     default:
-      _(r);
+      K(r);
   }
 }
 function vn(s, e) {
@@ -943,7 +943,7 @@ const Sn = (s) => {
   throw new Error(`No new block info for ${s}`);
 };
 class Ze {
-  constructor(e, t, r, o, n, i, a, c, u, l, d, f) {
+  constructor(e, t, r, o, n, i, a, c, u, l, d, h) {
     w(this, "globalModCount", 0);
     w(this, "fieldsChanged", !1);
     //
@@ -962,7 +962,7 @@ class Ze {
     w(this, "stagingGraph");
     w(this, "pendingProductionGraph");
     w(this, "actualProductionGraph");
-    this.rid = e, this.tx = t, this.author = r, this.schema = o, this.lastModified = n, this.meta = i, this.struct = a, this.renderingState = c, this.blocksInLimbo = u, this.blockInfos = l, this.blockFrontendStates = d, this.ctxExportTplHolder = f;
+    this.rid = e, this.tx = t, this.author = r, this.schema = o, this.lastModified = n, this.meta = i, this.struct = a, this.renderingState = c, this.blocksInLimbo = u, this.blockInfos = l, this.blockFrontendStates = d, this.ctxExportTplHolder = h;
   }
   fixProblemsAndMigrate() {
     this.blockInfos.forEach((t) => {
@@ -1014,7 +1014,7 @@ class Ze {
     throw new Error("block not found");
   }
   setBlockFieldObj(e, t, r) {
-    const o = j(this.rid, G(e, t));
+    const o = V(this.rid, G(e, t));
     if (r.ref === void 0) throw new Error("Can't set value with empty ref");
     this.getBlockInfo(e).fields[t] === void 0 ? this.tx.createField(o, "Dynamic", r.ref) : this.tx.setField(o, r.ref), this.getBlockInfo(e).fields[t] = {
       modCount: this.globalModCount++,
@@ -1029,7 +1029,7 @@ class Ze {
     const o = this.getBlockInfo(e);
     for (const n of t) {
       const i = o.fields;
-      n in i && (this.tx.removeField(j(this.rid, G(e, n))), delete i[n], this.fieldsChanged = !0, r = !0);
+      n in i && (this.tx.removeField(V(this.rid, G(e, n))), delete i[n], this.fieldsChanged = !0, r = !0);
     }
     return r;
   }
@@ -1156,8 +1156,8 @@ class Ze {
     for (const u of a.onlyInB) {
       const l = new hr(u, {});
       this.blockInfos.set(u, l);
-      const d = t(u), f = dr(this.tx, d.blockPack);
-      this.setBlockField(u, "blockPack", A.wrapInHolder(this.tx, f), "NotReady"), this.setBlockFieldObj(
+      const d = t(u), h = dr(this.tx, d.blockPack);
+      this.setBlockField(u, "blockPack", A.wrapInHolder(this.tx, h), "NotReady"), this.setBlockFieldObj(
         u,
         "blockSettings",
         this.createJsonFieldValue(Qt)
@@ -1344,12 +1344,12 @@ class Ze {
   static async load(e, t, r) {
     const o = e.getResourceData(t, !0), n = e.getKValueJson(t, ts), i = e.getKValueJson(t, Te), a = e.getKValueJson(t, Le), c = e.getKValueJson(t, de), u = e.getKValueJson(t, Qe), l = e.listKeyValuesString(t), [
       d,
-      f,
       h,
-      E,
+      f,
+      R,
       g,
-      { stagingRefreshTimestamp: N, blocksInLimbo: T },
-      V
+      { stagingRefreshTimestamp: B, blocksInLimbo: T },
+      N
     ] = await Promise.all([
       o,
       n,
@@ -1359,9 +1359,9 @@ class Ze {
       u,
       l
     ]);
-    if (f !== rs)
+    if (h !== rs)
       throw new Error(
-        `Can't act on this project resource because it has a wrong schema version: ${f}`
+        `Can't act on this project resource because it has a wrong schema version: ${h}`
       );
     const $ = /* @__PURE__ */ new Map();
     for (const p of d.fields) {
@@ -1373,17 +1373,17 @@ class Ze {
         fields: {}
       }, $.set(m.blockId, y)), y.fields[m.fieldName] = Ye(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
     }
-    const K = await ps(), pe = kt(K.hash), L = d.fields.find(
+    const M = await ps(), pe = kt(M.hash), L = d.fields.find(
       (p) => p.name === pe
     );
     let X;
-    L !== void 0 ? X = St(L.value) : (X = A.wrapInHolder(e, Bt(e, K.spec)), e.createField(
-      j(t, kt(K.hash)),
+    L !== void 0 ? X = St(L.value) : (X = A.wrapInHolder(e, Bt(e, M.spec)), e.createField(
+      V(t, kt(M.hash)),
       "Dynamic",
       X
     ));
-    const ne = { stagingRefreshTimestamp: N }, q = new Set(T), H = /* @__PURE__ */ new Map();
-    for (const p of V) {
+    const ne = { stagingRefreshTimestamp: B }, q = new Set(T), H = /* @__PURE__ */ new Map();
+    for (const p of N) {
       const m = Uo(p.key);
       m !== void 0 && H.set(m, p.value);
     }
@@ -1417,9 +1417,9 @@ class Ze {
       t,
       e,
       r,
-      f,
       h,
-      E,
+      f,
+      R,
       g,
       ne,
       q,
@@ -1437,7 +1437,7 @@ async function bn(s, e = No) {
   s.setKValue(t, ts, JSON.stringify(rs)), s.setKValue(t, Nt, r), s.setKValue(t, Te, r), s.setKValue(t, Le, JSON.stringify(e)), s.setKValue(t, de, JSON.stringify(Lo)), s.setKValue(t, Qe, JSON.stringify(Do));
   const o = await ps();
   return s.createField(
-    j(t, kt(o.hash)),
+    V(t, kt(o.hash)),
     "Dynamic",
     A.wrapInHolder(s, Bt(s, o.spec))
   ), t;
@@ -1468,7 +1468,7 @@ function* Rn(s) {
         yield e, yield t;
       return;
     default:
-      _(s);
+      K(s);
   }
 }
 function fr(s, e) {
@@ -1491,7 +1491,7 @@ function En(s, e) {
         }))
       };
     default:
-      _(s);
+      K(s);
   }
 }
 const Cn = De("PColumnData/JsonPartitioned", "1"), kn = De(
@@ -1629,24 +1629,24 @@ function hs(s, e = !0, t = !1, r = "") {
       if (e) throw new Error(`unexpected field name ${l}`);
       continue;
     }
-    let f = x((a = d.groups) == null ? void 0 : a.name);
-    if (!f.startsWith(r)) {
+    let h = j((a = d.groups) == null ? void 0 : a.name);
+    if (!h.startsWith(r)) {
       if (e) throw new Error(`unexpected field name ${l}`);
       continue;
     }
-    f = f.slice(r.length);
-    const h = x((c = d.groups) == null ? void 0 : c.type);
-    let E = n.get(f);
-    switch (E === void 0 && (E = {}, n.set(f, E)), h) {
+    h = h.slice(r.length);
+    const f = j((c = d.groups) == null ? void 0 : c.type);
+    let R = n.get(h);
+    switch (R === void 0 && (R = {}, n.set(h, R)), f) {
       case "spec":
-        E.spec = (u = s.traverse({
+        R.spec = (u = s.traverse({
           field: l,
           ignoreError: t,
           pureFieldErrorToUndefined: t
         })) == null ? void 0 : u.getDataAsJson();
         break;
       case "data":
-        E.hasData = !0, E.data = () => s.traverseOrError({
+        R.hasData = !0, R.data = () => s.traverseOrError({
           field: l,
           ignoreError: t
         });
@@ -1817,7 +1817,7 @@ class xt {
     return t;
   }
   static create(e, t, r) {
-    const o = e.accessor(t).node(), n = x(o.getKeyValueAsJson(de)), a = Ot(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
+    const o = e.accessor(t).node(), n = j(o.getKeyValueAsJson(de)), a = Ot(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
     for (const u of se(n)) {
       if (!a.has(u.id)) continue;
       const l = mr(
@@ -1854,7 +1854,7 @@ function mr(s, e) {
 function jt(s, e) {
   return {
     blockId: e,
-    args: (n) => x(
+    args: (n) => j(
       n.accessor(s).node().traverse({
         field: G(e, "currentArgs"),
         errorIfFieldNotSet: !0
@@ -1869,7 +1869,7 @@ function jt(s, e) {
     },
     uiState: (n) => n.accessor(s).node().getKeyValueAsString(Rt(e)),
     blockMeta: (n) => {
-      const i = n.accessor(s).node(), a = x(i.getKeyValueAsJson(de)), c = /* @__PURE__ */ new Map();
+      const i = n.accessor(s).node(), a = j(i.getKeyValueAsJson(de)), c = /* @__PURE__ */ new Map();
       for (const u of se(a)) c.set(u.id, u);
       return c;
     }
@@ -1946,7 +1946,7 @@ function* z(s, e) {
       yield* z(s.operand1), yield* z(s.operand2);
       return;
     default:
-      _(s);
+      K(s);
   }
 }
 function Dn(s, e) {
@@ -2373,7 +2373,7 @@ function P(s, e) {
         }
       });
     default:
-      return _(e);
+      return K(e);
   }
 }
 const ci = ["$prod", "$staging"];
@@ -2400,7 +2400,7 @@ function vr(s, e, t, r) {
   const o = new Yr(t), n = (a, c) => {
     if (di(a))
       return e.result = c, !1;
-    const u = x(e.pendingSubroutines.get(a.op));
+    const u = j(e.pendingSubroutines.get(a.op));
     if (a.arg in u.args) throw new Error("argument already set");
     return u.args[a.arg] = c, u.argCounter--, u.argCounter === 0 && (e.pendingSubroutines.delete(a.op), o.push({
       destination: u.destination,
@@ -2422,10 +2422,10 @@ function vr(s, e, t, r) {
               operation: c.subroutine({})
             });
           else {
-            for (const [f, h] of l)
+            for (const [h, f] of l)
               o.push({
-                destination: { op: u, arg: f },
-                operation: h
+                destination: { op: u, arg: h },
+                operation: f
               });
             e.pendingSubroutines.set(u, {
               argCounter: d,
@@ -2445,7 +2445,7 @@ function vr(s, e, t, r) {
         });
         break;
       default:
-        _(c);
+        K(c);
     }
   }
   return i;
@@ -2477,23 +2477,23 @@ function ws(s, e, t, r = {}) {
         ),
         postprocessValue(u) {
           const l = [];
-          for (const E of u)
-            l.push({ destination: E.destination, operation: k(E.computable) });
+          for (const R of u)
+            l.push({ destination: R.destination, operation: k(R.computable) });
           const d = {
             drivers: s,
             get cCtx() {
               throw new Error("asynchronous operations are forbidden in this context");
             }
-          }, f = /* @__PURE__ */ new Map();
-          for (const [E, g] of a.pendingSubroutines)
-            f.set(E, { ...g, args: { ...g.args } });
-          const h = {
+          }, h = /* @__PURE__ */ new Map();
+          for (const [R, g] of a.pendingSubroutines)
+            h.set(R, { ...g, args: { ...g.args } });
+          const f = {
             result: a.result,
-            pendingSubroutines: f
+            pendingSubroutines: h
           };
-          if (vr(d, h, l, !1), !("result" in h))
+          if (vr(d, f, l, !1), !("result" in f))
             throw new Error("illegal cfg rendering stack state, no result");
-          return h.result;
+          return f.result;
         }
       };
     },
@@ -2507,7 +2507,7 @@ function yr(s) {
   return s !== void 0 ? Buffer.from(s).toString("base64") : void 0;
 }
 class et {
-  constructor(e, t, r, o, n) {
+  constructor(e, t, r, o, n, i) {
     w(this, "callbackRegistry");
     w(this, "fnJSONStringify");
     w(this, "fnJSONParse");
@@ -2520,14 +2520,14 @@ class et {
     // Result Pool
     //
     w(this, "_resultPool");
-    if (this.scope = e, this.vm = t, this.blockCtx = r, this.env = o, this.computableCtx = n, this.callbackRegistry = this.scope.manage(this.vm.newObject()), this.fnJSONStringify = e.manage(
-      t.getProp(t.global, "JSON").consume((i) => t.getProp(i, "stringify"))
+    if (this.scope = e, this.vm = t, this.blockCtx = r, this.env = o, this.deadlineSetter = n, this.computableCtx = i, this.callbackRegistry = this.scope.manage(this.vm.newObject()), this.fnJSONStringify = e.manage(
+      t.getProp(t.global, "JSON").consume((a) => t.getProp(a, "stringify"))
     ), t.typeof(this.fnJSONStringify) !== "function")
       throw new Error("JSON.stringify() not found.");
     if (this.fnJSONParse = e.manage(
-      t.getProp(t.global, "JSON").consume((i) => t.getProp(i, "parse"))
+      t.getProp(t.global, "JSON").consume((a) => t.getProp(a, "parse"))
     ), t.typeof(this.fnJSONParse) !== "function") throw new Error("JSON.parse() not found.");
-    this.meta = r.blockMeta(n), this.injectCtx();
+    this.meta = r.blockMeta(i), this.injectCtx();
   }
   resetComputableCtx() {
     this.computableCtx = void 0, this.accessors.clear();
@@ -2537,14 +2537,16 @@ class et {
   }
   evaluateBundle(e) {
     try {
-      this.vm.unwrapResult(this.vm.evalCode(e, "bundle.js", { type: "global" })).dispose();
+      this.deadlineSetter({ currentExecutionTarget: "evaluateBundle", deadline: Date.now() + 1e4 }), this.vm.unwrapResult(this.vm.evalCode(e, "bundle.js", { type: "global" })).dispose();
     } catch (t) {
       throw et.cleanErrorContext(t), t;
+    } finally {
+      this.deadlineSetter(void 0);
     }
   }
   runCallback(e, ...t) {
     try {
-      return bt.withScope((r) => {
+      return this.deadlineSetter({ currentExecutionTarget: e, deadline: Date.now() + 1e4 }), bt.withScope((r) => {
         const o = r.manage(this.vm.getProp(this.callbackRegistry, e));
         if (this.vm.typeof(o) !== "function")
           throw new Error(`No such callback: ${e}`);
@@ -2560,6 +2562,8 @@ class et {
       });
     } catch (r) {
       throw et.cleanErrorContext(r), this.errorRepo.getOriginal(r);
+    } finally {
+      this.deadlineSetter(void 0);
     }
   }
   //
@@ -2750,7 +2754,7 @@ class et {
         throw new Error(
           "can't use result pool in this context (most porbably called from the future mapper)"
         );
-      this._resultPool = x(
+      this._resultPool = j(
         this.blockCtx.getResultsPool,
         "getResultsPool"
       )(this.computableCtx);
@@ -2930,8 +2934,8 @@ class et {
           try {
             return c(...l);
           } catch (d) {
-            const f = this.errorRepo.setAndRecreateForQuickJS(d);
-            throw this.vm.newError(f);
+            const h = this.errorRepo.setAndRecreateForQuickJS(d);
+            throw this.vm.newError(h);
           }
         };
         this.vm.newFunction(a, u).consume((l) => this.vm.setProp(t, a, l)), this.vm.newFunction(a, c).consume((l) => this.vm.setProp(t, a + "__internal__", l));
@@ -3070,19 +3074,30 @@ function mi(s, e, t, r, o, n = {}) {
     a.addOnDestroy(() => c.dispose());
     const u = c.manage(s.quickJs.newRuntime());
     u.setMemoryLimit(1024 * 1024 * 8), u.setMaxStackSize(1024 * 320);
-    const l = c.manage(u.newContext()), d = new et(c, l, e, s, a);
-    d.evaluateBundle(r.content);
-    const f = d.runCallback(t.handle);
-    d.resetComputableCtx();
-    let h = 0;
+    let l;
+    u.setInterruptHandler(() => l === void 0 ? !1 : Date.now() > l.deadline);
+    const d = c.manage(u.newContext()), h = new et(
+      c,
+      d,
+      e,
+      s,
+      (g) => {
+        l = g;
+      },
+      a
+    );
+    h.evaluateBundle(r.content);
+    const f = h.runCallback(t.handle);
+    h.resetComputableCtx();
+    let R = 0;
     return Me && Me !== "unstable-only" && console.log(`Output ${t.handle} scaffold calculated.`), {
-      ir: d.computablesToResolve,
-      postprocessValue: (E, { unstableMarker: g, stable: N }) => {
-        for (const [V, $] of Object.entries(E)) d.runCallback(V, $);
-        const T = d.importObjectUniversal(f);
-        return h++, Me && (Me !== "unstable-only" || !N) && console.log(
-          N ? `Stable output ${t.handle} calculated ${T !== void 0 ? "defined" : "undefined"}; (#${h})` : `Unstable output ${t.handle}; marker = ${g}; ${T !== void 0 ? "defined" : "undefined"} (#${h})`
-        ), T;
+      ir: h.computablesToResolve,
+      postprocessValue: (g, { unstableMarker: B, stable: T }) => {
+        for (const [$, M] of Object.entries(g)) h.runCallback($, M);
+        const N = h.importObjectUniversal(f);
+        return R++, Me && (Me !== "unstable-only" || !T) && console.log(
+          T ? `Stable output ${t.handle} calculated ${N !== void 0 ? "defined" : "undefined"}; (#${R})` : `Unstable output ${t.handle}; marker = ${B}; ${N !== void 0 ? "defined" : "undefined"} (#${R})`
+        ), N;
       }
     };
   }, n);
@@ -3099,8 +3114,8 @@ function Ie(s, e, t, r, o, n = {}) {
 function yi(s, e, t) {
   return J.make(
     (r) => {
-      var E, g, N, T, V, $, K, pe;
-      const o = r.accessor(s).node(), n = x(o.getKeyValueAsJson(Nt)), i = x(o.getKeyValueAsJson(Te)), a = x(o.getKeyValueAsJson(Le)), c = x(o.getKeyValueAsJson(de)), u = x(
+      var R, g, B, T, N, $, M, pe;
+      const o = r.accessor(s).node(), n = j(o.getKeyValueAsJson(Nt)), i = j(o.getKeyValueAsJson(Te)), a = j(o.getKeyValueAsJson(Le)), c = j(o.getKeyValueAsJson(de)), u = j(
         o.getKeyValueAsJson(Qe)
       ), l = /* @__PURE__ */ new Map();
       for (const { id: L } of se(c)) {
@@ -3128,20 +3143,20 @@ function yi(s, e, t) {
           ne = {
             arguments: q.getDataAsJson(),
             stale: X.id !== q.id,
-            outputError: H.error !== void 0 || U.error !== void 0 || ((E = H.value) == null ? void 0 : E.getError()) !== void 0 || ((g = U.value) == null ? void 0 : g.getError()) !== void 0,
-            outputsError: ((N = H.error) == null ? void 0 : N.getDataAsString()) ?? ((V = (T = H.value) == null ? void 0 : T.getError()) == null ? void 0 : V.getDataAsString()),
-            exportsError: (($ = U.error) == null ? void 0 : $.getDataAsString()) ?? ((pe = (K = U.value) == null ? void 0 : K.getError()) == null ? void 0 : pe.getDataAsString()),
+            outputError: H.error !== void 0 || U.error !== void 0 || ((R = H.value) == null ? void 0 : R.getError()) !== void 0 || ((g = U.value) == null ? void 0 : g.getError()) !== void 0,
+            outputsError: ((B = H.error) == null ? void 0 : B.getDataAsString()) ?? ((N = (T = H.value) == null ? void 0 : T.getError()) == null ? void 0 : N.getDataAsString()),
+            exportsError: (($ = U.error) == null ? void 0 : $.getDataAsString()) ?? ((pe = (M = U.value) == null ? void 0 : M.getError()) == null ? void 0 : pe.getDataAsString()),
             finished: (H.value !== void 0 && H.value.getIsReadyOrError() || H.error !== void 0 && H.error.getIsReadyOrError()) && (U.value !== void 0 && U.value.getIsReadyOrError() || U.error !== void 0 && U.error.getIsReadyOrError())
           };
         }
         l.set(L, { currentArguments: X.getDataAsJson(), prod: ne });
       }
-      const d = Xe(c, (L) => l.get(L).currentArguments), f = new Set(u.blocksInLimbo), h = [...se(c)].map(({ id: L, label: X, renderingMode: ne }) => {
-        var S, R, O, C, F;
-        const q = x(l.get(L)), H = x(d.nodes.get(L));
+      const d = Xe(c, (L) => l.get(L).currentArguments), h = new Set(u.blocksInLimbo), f = [...se(c)].map(({ id: L, label: X, renderingMode: ne }) => {
+        var S, E, O, C, F;
+        const q = j(l.get(L)), H = j(d.nodes.get(L));
         let U = "NotCalculated";
-        q.prod !== void 0 && (f.has(L) ? U = "Limbo" : U = q.prod.finished ? "Done" : "Running");
-        const Y = rt(o, L), { sections: he, title: v, inputsValid: p, sdkVersion: m } = $e(Y, ({ bpId: B, cfg: I }) => {
+        q.prod !== void 0 && (h.has(L) ? U = "Limbo" : U = q.prod.finished ? "Done" : "Running");
+        const Y = rt(o, L), { sections: he, title: v, inputsValid: p, sdkVersion: m } = $e(Y, ({ bpId: x, cfg: I }) => {
           const oe = jt(s, L);
           return {
             sections: Ie(
@@ -3149,7 +3164,7 @@ function yi(s, e, t) {
               oe,
               I.sections,
               I.code,
-              B
+              x
             ).wrap({
               recover: (Se) => (t.logger.error("Error in block model sections"), t.logger.error(Se), [])
             }),
@@ -3160,7 +3175,7 @@ function yi(s, e, t) {
                 oe,
                 Se,
                 I.code,
-                B
+                x
               ).wrap({
                 recover: (As) => (t.logger.error("Error in block model title"), t.logger.error(As), "Invalid title")
               })
@@ -3170,7 +3185,7 @@ function yi(s, e, t) {
               oe,
               I.inputsValid,
               I.code,
-              B
+              x
             ).wrap({
               recover: (Se) => (t.logger.error("Error in block model argsValid"), t.logger.error(Se), !1)
             }),
@@ -3182,7 +3197,7 @@ function yi(s, e, t) {
           errorIfFieldNotSet: !0
         }).getDataAsJson(), b = $e(
           Y,
-          ({ info: B }) => t.blockUpdateWatcher.get({ currentSpec: B.source, settings: y })
+          ({ info: x }) => t.blockUpdateWatcher.get({ currentSpec: x.source, settings: y })
         );
         return {
           projectResourceId: ve(s.rid),
@@ -3195,7 +3210,7 @@ function yi(s, e, t) {
           upstreams: [...d.traverseIdsExcludingRoots("upstream", L)],
           downstreams: [...d.traverseIdsExcludingRoots("downstream", L)],
           calculationStatus: U,
-          outputErrors: ((R = q.prod) == null ? void 0 : R.outputError) === !0,
+          outputErrors: ((E = q.prod) == null ? void 0 : E.outputError) === !0,
           outputsError: (O = q.prod) == null ? void 0 : O.outputsError,
           exportsError: (C = q.prod) == null ? void 0 : C.exportsError,
           settings: y,
@@ -3213,7 +3228,7 @@ function yi(s, e, t) {
         created: new Date(n),
         lastModified: new Date(i),
         authorMarker: o.getKeyValueAsJson(Ct),
-        blocks: h
+        blocks: f
       };
     },
     {
@@ -3224,7 +3239,7 @@ function yi(s, e, t) {
           blocks: r.blocks.map((i) => {
             var l, d;
             i.inputsValid || o.add(i.id), i.stale && n.add(i.id);
-            const a = i.stale || i.upstreams.findIndex((f) => n.has(f)) !== -1, c = (a || i.outputErrors) && !!i.inputsValid && !i.missingReference && i.upstreams.findIndex((f) => o.has(f)) === -1, u = {
+            const a = i.stale || i.upstreams.findIndex((h) => n.has(h)) !== -1, c = (a || i.outputErrors) && !!i.inputsValid && !i.missingReference && i.upstreams.findIndex((h) => o.has(h)) === -1, u = {
               ...i,
               canRun: c,
               stale: a,
@@ -3320,7 +3335,7 @@ function Ri(s, e, t) {
 }
 function Ei(s, e) {
   return J.make((t) => {
-    const r = t.accessor(s).node(), o = x(r.getKeyValueAsJson(de)), n = [];
+    const r = t.accessor(s).node(), o = j(r.getKeyValueAsJson(de)), n = [];
     for (const { id: i } of se(o)) {
       const a = rt(r, i);
       if (a === void 0) continue;
@@ -3563,11 +3578,11 @@ class Vt {
   async resetBlockArgsAndUiState(e, t) {
     await this.env.pl.withWriteTx("BlockInputsReset", async (r) => {
       const o = St(
-        (await r.getField(j(this.rid, G(e, "blockPack")))).value
+        (await r.getField(V(this.rid, G(e, "blockPack")))).value
       ), n = St(
-        (await r.getField(j(o, A.HolderRefField))).value
+        (await r.getField(V(o, A.HolderRefField))).value
       ), i = await r.getResourceData(n, !1), a = ze(JSON.parse(
-        Buffer.from(x(i.data)).toString("utf-8")
+        Buffer.from(j(i.data)).toString("utf-8")
       ).config);
       await Z(r, this.rid, t, (c) => {
         c.setArgs([{ blockId: e, args: D(a.initialArgs) }]), c.setUiState(e, D(a.initialUiState));
@@ -3587,8 +3602,8 @@ class Vt {
           }),
           {
             postprocessValue: (i) => {
-              var l, d, f;
-              const a = (f = (d = (l = i.overview) == null ? void 0 : l.blocks) == null ? void 0 : d.find((h) => h.id == e)) == null ? void 0 : f.sdkVersion, u = a && Pi(a) && i.outputs !== void 0 ? $i(i.outputs) : i.outputs;
+              var l, d, h;
+              const a = (h = (d = (l = i.overview) == null ? void 0 : l.blocks) == null ? void 0 : d.find((f) => f.id == e)) == null ? void 0 : h.sdkVersion, u = a && Pi(a) && i.outputs !== void 0 ? $i(i.outputs) : i.outputs;
               return {
                 ...i.argsAndUiState,
                 outputs: u,
@@ -3719,8 +3734,8 @@ const bs = {
 };
 function Rs(s) {
   return {
-    blobDownloadPath: M.join(s, "download"),
-    downloadBlobToURLPath: M.join(s, "downloadToURL")
+    blobDownloadPath: _.join(s, "download"),
+    downloadBlobToURLPath: _.join(s, "downloadToURL")
   };
 }
 const Ii = {
@@ -3741,7 +3756,7 @@ const Ii = {
 function Fi(s) {
   return {
     ...Rs(s),
-    frontendDownloadPath: M.join(s, "frontend")
+    frontendDownloadPath: _.join(s, "frontend")
   };
 }
 function Ai(s) {
@@ -3780,19 +3795,19 @@ var ot = xi;
   e = s.exports = {};
   const i = e.re = [], a = e.safeRe = [], c = e.src = [], u = e.safeSrc = [], l = e.t = {};
   let d = 0;
-  const f = "[a-zA-Z0-9-]", h = [
+  const h = "[a-zA-Z0-9-]", f = [
     ["\\s", 1],
     ["\\d", o],
-    [f, r]
-  ], E = (N) => {
-    for (const [T, V] of h)
-      N = N.split(`${T}*`).join(`${T}{0,${V}}`).split(`${T}+`).join(`${T}{1,${V}}`);
-    return N;
-  }, g = (N, T, V) => {
-    const $ = E(T), K = d++;
-    n(N, K, T), l[N] = K, c[K] = T, u[K] = $, i[K] = new RegExp(T, V ? "g" : void 0), a[K] = new RegExp($, V ? "g" : void 0);
+    [h, r]
+  ], R = (B) => {
+    for (const [T, N] of f)
+      B = B.split(`${T}*`).join(`${T}{0,${N}}`).split(`${T}+`).join(`${T}{1,${N}}`);
+    return B;
+  }, g = (B, T, N) => {
+    const $ = R(T), M = d++;
+    n(B, M, T), l[B] = M, c[M] = T, u[M] = $, i[M] = new RegExp(T, N ? "g" : void 0), a[M] = new RegExp($, N ? "g" : void 0);
   };
-  g("NUMERICIDENTIFIER", "0|[1-9]\\d*"), g("NUMERICIDENTIFIERLOOSE", "\\d+"), g("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${f}*`), g("MAINVERSION", `(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})`), g("MAINVERSIONLOOSE", `(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})`), g("PRERELEASEIDENTIFIER", `(?:${c[l.NUMERICIDENTIFIER]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASEIDENTIFIERLOOSE", `(?:${c[l.NUMERICIDENTIFIERLOOSE]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASE", `(?:-(${c[l.PRERELEASEIDENTIFIER]}(?:\\.${c[l.PRERELEASEIDENTIFIER]})*))`), g("PRERELEASELOOSE", `(?:-?(${c[l.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${c[l.PRERELEASEIDENTIFIERLOOSE]})*))`), g("BUILDIDENTIFIER", `${f}+`), g("BUILD", `(?:\\+(${c[l.BUILDIDENTIFIER]}(?:\\.${c[l.BUILDIDENTIFIER]})*))`), g("FULLPLAIN", `v?${c[l.MAINVERSION]}${c[l.PRERELEASE]}?${c[l.BUILD]}?`), g("FULL", `^${c[l.FULLPLAIN]}$`), g("LOOSEPLAIN", `[v=\\s]*${c[l.MAINVERSIONLOOSE]}${c[l.PRERELEASELOOSE]}?${c[l.BUILD]}?`), g("LOOSE", `^${c[l.LOOSEPLAIN]}$`), g("GTLT", "((?:<|>)?=?)"), g("XRANGEIDENTIFIERLOOSE", `${c[l.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`), g("XRANGEIDENTIFIER", `${c[l.NUMERICIDENTIFIER]}|x|X|\\*`), g("XRANGEPLAIN", `[v=\\s]*(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:${c[l.PRERELEASE]})?${c[l.BUILD]}?)?)?`), g("XRANGEPLAINLOOSE", `[v=\\s]*(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:${c[l.PRERELEASELOOSE]})?${c[l.BUILD]}?)?)?`), g("XRANGE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAIN]}$`), g("XRANGELOOSE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAINLOOSE]}$`), g("COERCEPLAIN", `(^|[^\\d])(\\d{1,${t}})(?:\\.(\\d{1,${t}}))?(?:\\.(\\d{1,${t}}))?`), g("COERCE", `${c[l.COERCEPLAIN]}(?:$|[^\\d])`), g("COERCEFULL", c[l.COERCEPLAIN] + `(?:${c[l.PRERELEASE]})?(?:${c[l.BUILD]})?(?:$|[^\\d])`), g("COERCERTL", c[l.COERCE], !0), g("COERCERTLFULL", c[l.COERCEFULL], !0), g("LONETILDE", "(?:~>?)"), g("TILDETRIM", `(\\s*)${c[l.LONETILDE]}\\s+`, !0), e.tildeTrimReplace = "$1~", g("TILDE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAIN]}$`), g("TILDELOOSE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAINLOOSE]}$`), g("LONECARET", "(?:\\^)"), g("CARETTRIM", `(\\s*)${c[l.LONECARET]}\\s+`, !0), e.caretTrimReplace = "$1^", g("CARET", `^${c[l.LONECARET]}${c[l.XRANGEPLAIN]}$`), g("CARETLOOSE", `^${c[l.LONECARET]}${c[l.XRANGEPLAINLOOSE]}$`), g("COMPARATORLOOSE", `^${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]})$|^$`), g("COMPARATOR", `^${c[l.GTLT]}\\s*(${c[l.FULLPLAIN]})$|^$`), g("COMPARATORTRIM", `(\\s*)${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]}|${c[l.XRANGEPLAIN]})`, !0), e.comparatorTrimReplace = "$1$2$3", g("HYPHENRANGE", `^\\s*(${c[l.XRANGEPLAIN]})\\s+-\\s+(${c[l.XRANGEPLAIN]})\\s*$`), g("HYPHENRANGELOOSE", `^\\s*(${c[l.XRANGEPLAINLOOSE]})\\s+-\\s+(${c[l.XRANGEPLAINLOOSE]})\\s*$`), g("STAR", "(<|>)?=?\\s*\\*"), g("GTE0", "^\\s*>=\\s*0\\.0\\.0\\s*$"), g("GTE0PRE", "^\\s*>=\\s*0\\.0\\.0-0\\s*$");
+  g("NUMERICIDENTIFIER", "0|[1-9]\\d*"), g("NUMERICIDENTIFIERLOOSE", "\\d+"), g("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${h}*`), g("MAINVERSION", `(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})`), g("MAINVERSIONLOOSE", `(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})`), g("PRERELEASEIDENTIFIER", `(?:${c[l.NUMERICIDENTIFIER]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASEIDENTIFIERLOOSE", `(?:${c[l.NUMERICIDENTIFIERLOOSE]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASE", `(?:-(${c[l.PRERELEASEIDENTIFIER]}(?:\\.${c[l.PRERELEASEIDENTIFIER]})*))`), g("PRERELEASELOOSE", `(?:-?(${c[l.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${c[l.PRERELEASEIDENTIFIERLOOSE]})*))`), g("BUILDIDENTIFIER", `${h}+`), g("BUILD", `(?:\\+(${c[l.BUILDIDENTIFIER]}(?:\\.${c[l.BUILDIDENTIFIER]})*))`), g("FULLPLAIN", `v?${c[l.MAINVERSION]}${c[l.PRERELEASE]}?${c[l.BUILD]}?`), g("FULL", `^${c[l.FULLPLAIN]}$`), g("LOOSEPLAIN", `[v=\\s]*${c[l.MAINVERSIONLOOSE]}${c[l.PRERELEASELOOSE]}?${c[l.BUILD]}?`), g("LOOSE", `^${c[l.LOOSEPLAIN]}$`), g("GTLT", "((?:<|>)?=?)"), g("XRANGEIDENTIFIERLOOSE", `${c[l.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`), g("XRANGEIDENTIFIER", `${c[l.NUMERICIDENTIFIER]}|x|X|\\*`), g("XRANGEPLAIN", `[v=\\s]*(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:${c[l.PRERELEASE]})?${c[l.BUILD]}?)?)?`), g("XRANGEPLAINLOOSE", `[v=\\s]*(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:${c[l.PRERELEASELOOSE]})?${c[l.BUILD]}?)?)?`), g("XRANGE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAIN]}$`), g("XRANGELOOSE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAINLOOSE]}$`), g("COERCEPLAIN", `(^|[^\\d])(\\d{1,${t}})(?:\\.(\\d{1,${t}}))?(?:\\.(\\d{1,${t}}))?`), g("COERCE", `${c[l.COERCEPLAIN]}(?:$|[^\\d])`), g("COERCEFULL", c[l.COERCEPLAIN] + `(?:${c[l.PRERELEASE]})?(?:${c[l.BUILD]})?(?:$|[^\\d])`), g("COERCERTL", c[l.COERCE], !0), g("COERCERTLFULL", c[l.COERCEFULL], !0), g("LONETILDE", "(?:~>?)"), g("TILDETRIM", `(\\s*)${c[l.LONETILDE]}\\s+`, !0), e.tildeTrimReplace = "$1~", g("TILDE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAIN]}$`), g("TILDELOOSE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAINLOOSE]}$`), g("LONECARET", "(?:\\^)"), g("CARETTRIM", `(\\s*)${c[l.LONECARET]}\\s+`, !0), e.caretTrimReplace = "$1^", g("CARET", `^${c[l.LONECARET]}${c[l.XRANGEPLAIN]}$`), g("CARETLOOSE", `^${c[l.LONECARET]}${c[l.XRANGEPLAINLOOSE]}$`), g("COMPARATORLOOSE", `^${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]})$|^$`), g("COMPARATOR", `^${c[l.GTLT]}\\s*(${c[l.FULLPLAIN]})$|^$`), g("COMPARATORTRIM", `(\\s*)${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]}|${c[l.XRANGEPLAIN]})`, !0), e.comparatorTrimReplace = "$1$2$3", g("HYPHENRANGE", `^\\s*(${c[l.XRANGEPLAIN]})\\s+-\\s+(${c[l.XRANGEPLAIN]})\\s*$`), g("HYPHENRANGELOOSE", `^\\s*(${c[l.XRANGEPLAINLOOSE]})\\s+-\\s+(${c[l.XRANGEPLAINLOOSE]})\\s*$`), g("STAR", "(<|>)?=?\\s*\\*"), g("GTE0", "^\\s*>=\\s*0\\.0\\.0\\s*$"), g("GTE0PRE", "^\\s*>=\\s*0\\.0\\.0-0\\s*$");
 })(It, It.exports);
 var Be = It.exports;
 const ji = Object.freeze({ loose: !0 }), Vi = Object.freeze({}), Ui = (s) => s ? typeof s != "object" ? ji : s : Vi;
@@ -4133,7 +4148,7 @@ function te() {
           this.set = [y];
         else if (this.set.length > 1) {
           for (const b of this.set)
-            if (b.length === 1 && N(b[0])) {
+            if (b.length === 1 && B(b[0])) {
               this.set = [b];
               break;
             }
@@ -4160,12 +4175,12 @@ function te() {
       return this.range;
     }
     parseRange(p) {
-      const y = ((this.options.includePrerelease && h) | (this.options.loose && E)) + ":" + p, b = r.get(y);
+      const y = ((this.options.includePrerelease && f) | (this.options.loose && R)) + ":" + p, b = r.get(y);
       if (b)
         return b;
-      const S = this.options.loose, R = S ? c[u.HYPHENRANGELOOSE] : c[u.HYPHENRANGE];
-      p = p.replace(R, Y(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[u.COMPARATORTRIM], l), i("comparator trim", p), p = p.replace(c[u.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[u.CARETTRIM], f), i("caret trim", p);
-      let O = p.split(" ").map((I) => V(I, this.options)).join(" ").split(/\s+/).map((I) => U(I, this.options));
+      const S = this.options.loose, E = S ? c[u.HYPHENRANGELOOSE] : c[u.HYPHENRANGE];
+      p = p.replace(E, Y(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[u.COMPARATORTRIM], l), i("comparator trim", p), p = p.replace(c[u.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[u.CARETTRIM], h), i("caret trim", p);
+      let O = p.split(" ").map((I) => N(I, this.options)).join(" ").split(/\s+/).map((I) => U(I, this.options));
       S && (O = O.filter((I) => (i("loose invalid filter", I, this.options), !!I.match(c[u.COMPARATORLOOSE])))), i("range list", O);
       const C = /* @__PURE__ */ new Map(), F = O.map((I) => new n(I, this.options));
       for (const I of F) {
@@ -4174,13 +4189,13 @@ function te() {
         C.set(I.value, I);
       }
       C.size > 1 && C.has("") && C.delete("");
-      const B = [...C.values()];
-      return r.set(y, B), B;
+      const x = [...C.values()];
+      return r.set(y, x), x;
     }
     intersects(p, m) {
       if (!(p instanceof e))
         throw new TypeError("a Range is required");
-      return this.set.some((y) => T(y, m) && p.set.some((b) => T(b, m) && y.every((S) => b.every((R) => S.intersects(R, m)))));
+      return this.set.some((y) => T(y, m) && p.set.some((b) => T(b, m) && y.every((S) => b.every((E) => S.intersects(E, m)))));
     }
     // if ANY of the sets match ALL of its comparators, then pass
     test(p) {
@@ -4204,38 +4219,38 @@ function te() {
     t: u,
     comparatorTrimReplace: l,
     tildeTrimReplace: d,
-    caretTrimReplace: f
-  } = Be, { FLAG_INCLUDE_PRERELEASE: h, FLAG_LOOSE: E } = st, g = (v) => v.value === "<0.0.0-0", N = (v) => v.value === "", T = (v, p) => {
+    caretTrimReplace: h
+  } = Be, { FLAG_INCLUDE_PRERELEASE: f, FLAG_LOOSE: R } = st, g = (v) => v.value === "<0.0.0-0", B = (v) => v.value === "", T = (v, p) => {
     let m = !0;
     const y = v.slice();
     let b = y.pop();
     for (; m && y.length; )
       m = y.every((S) => b.intersects(S, p)), b = y.pop();
     return m;
-  }, V = (v, p) => (i("comp", v, p), v = L(v, p), i("caret", v), v = K(v, p), i("tildes", v), v = ne(v, p), i("xrange", v), v = H(v, p), i("stars", v), v), $ = (v) => !v || v.toLowerCase() === "x" || v === "*", K = (v, p) => v.trim().split(/\s+/).map((m) => pe(m, p)).join(" "), pe = (v, p) => {
+  }, N = (v, p) => (i("comp", v, p), v = L(v, p), i("caret", v), v = M(v, p), i("tildes", v), v = ne(v, p), i("xrange", v), v = H(v, p), i("stars", v), v), $ = (v) => !v || v.toLowerCase() === "x" || v === "*", M = (v, p) => v.trim().split(/\s+/).map((m) => pe(m, p)).join(" "), pe = (v, p) => {
     const m = p.loose ? c[u.TILDELOOSE] : c[u.TILDE];
-    return v.replace(m, (y, b, S, R, O) => {
-      i("tilde", v, y, b, S, R, O);
+    return v.replace(m, (y, b, S, E, O) => {
+      i("tilde", v, y, b, S, E, O);
       let C;
-      return $(b) ? C = "" : $(S) ? C = `>=${b}.0.0 <${+b + 1}.0.0-0` : $(R) ? C = `>=${b}.${S}.0 <${b}.${+S + 1}.0-0` : O ? (i("replaceTilde pr", O), C = `>=${b}.${S}.${R}-${O} <${b}.${+S + 1}.0-0`) : C = `>=${b}.${S}.${R} <${b}.${+S + 1}.0-0`, i("tilde return", C), C;
+      return $(b) ? C = "" : $(S) ? C = `>=${b}.0.0 <${+b + 1}.0.0-0` : $(E) ? C = `>=${b}.${S}.0 <${b}.${+S + 1}.0-0` : O ? (i("replaceTilde pr", O), C = `>=${b}.${S}.${E}-${O} <${b}.${+S + 1}.0-0`) : C = `>=${b}.${S}.${E} <${b}.${+S + 1}.0-0`, i("tilde return", C), C;
     });
   }, L = (v, p) => v.trim().split(/\s+/).map((m) => X(m, p)).join(" "), X = (v, p) => {
     i("caret", v, p);
     const m = p.loose ? c[u.CARETLOOSE] : c[u.CARET], y = p.includePrerelease ? "-0" : "";
-    return v.replace(m, (b, S, R, O, C) => {
-      i("caret", v, b, S, R, O, C);
+    return v.replace(m, (b, S, E, O, C) => {
+      i("caret", v, b, S, E, O, C);
       let F;
-      return $(S) ? F = "" : $(R) ? F = `>=${S}.0.0${y} <${+S + 1}.0.0-0` : $(O) ? S === "0" ? F = `>=${S}.${R}.0${y} <${S}.${+R + 1}.0-0` : F = `>=${S}.${R}.0${y} <${+S + 1}.0.0-0` : C ? (i("replaceCaret pr", C), S === "0" ? R === "0" ? F = `>=${S}.${R}.${O}-${C} <${S}.${R}.${+O + 1}-0` : F = `>=${S}.${R}.${O}-${C} <${S}.${+R + 1}.0-0` : F = `>=${S}.${R}.${O}-${C} <${+S + 1}.0.0-0`) : (i("no pr"), S === "0" ? R === "0" ? F = `>=${S}.${R}.${O}${y} <${S}.${R}.${+O + 1}-0` : F = `>=${S}.${R}.${O}${y} <${S}.${+R + 1}.0-0` : F = `>=${S}.${R}.${O} <${+S + 1}.0.0-0`), i("caret return", F), F;
+      return $(S) ? F = "" : $(E) ? F = `>=${S}.0.0${y} <${+S + 1}.0.0-0` : $(O) ? S === "0" ? F = `>=${S}.${E}.0${y} <${S}.${+E + 1}.0-0` : F = `>=${S}.${E}.0${y} <${+S + 1}.0.0-0` : C ? (i("replaceCaret pr", C), S === "0" ? E === "0" ? F = `>=${S}.${E}.${O}-${C} <${S}.${E}.${+O + 1}-0` : F = `>=${S}.${E}.${O}-${C} <${S}.${+E + 1}.0-0` : F = `>=${S}.${E}.${O}-${C} <${+S + 1}.0.0-0`) : (i("no pr"), S === "0" ? E === "0" ? F = `>=${S}.${E}.${O}${y} <${S}.${E}.${+O + 1}-0` : F = `>=${S}.${E}.${O}${y} <${S}.${+E + 1}.0-0` : F = `>=${S}.${E}.${O} <${+S + 1}.0.0-0`), i("caret return", F), F;
     });
   }, ne = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((m) => q(m, p)).join(" ")), q = (v, p) => {
     v = v.trim();
     const m = p.loose ? c[u.XRANGELOOSE] : c[u.XRANGE];
-    return v.replace(m, (y, b, S, R, O, C) => {
-      i("xRange", v, y, b, S, R, O, C);
-      const F = $(S), B = F || $(R), I = B || $(O), oe = I;
-      return b === "=" && oe && (b = ""), C = p.includePrerelease ? "-0" : "", F ? b === ">" || b === "<" ? y = "<0.0.0-0" : y = "*" : b && oe ? (B && (R = 0), O = 0, b === ">" ? (b = ">=", B ? (S = +S + 1, R = 0, O = 0) : (R = +R + 1, O = 0)) : b === "<=" && (b = "<", B ? S = +S + 1 : R = +R + 1), b === "<" && (C = "-0"), y = `${b + S}.${R}.${O}${C}`) : B ? y = `>=${S}.0.0${C} <${+S + 1}.0.0-0` : I && (y = `>=${S}.${R}.0${C} <${S}.${+R + 1}.0-0`), i("xRange return", y), y;
+    return v.replace(m, (y, b, S, E, O, C) => {
+      i("xRange", v, y, b, S, E, O, C);
+      const F = $(S), x = F || $(E), I = x || $(O), oe = I;
+      return b === "=" && oe && (b = ""), C = p.includePrerelease ? "-0" : "", F ? b === ">" || b === "<" ? y = "<0.0.0-0" : y = "*" : b && oe ? (x && (E = 0), O = 0, b === ">" ? (b = ">=", x ? (S = +S + 1, E = 0, O = 0) : (E = +E + 1, O = 0)) : b === "<=" && (b = "<", x ? S = +S + 1 : E = +E + 1), b === "<" && (C = "-0"), y = `${b + S}.${E}.${O}${C}`) : x ? y = `>=${S}.0.0${C} <${+S + 1}.0.0-0` : I && (y = `>=${S}.${E}.0${C} <${S}.${+E + 1}.0-0`), i("xRange return", y), y;
     });
-  }, H = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[u.STAR], "")), U = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? u.GTE0PRE : u.GTE0], "")), Y = (v) => (p, m, y, b, S, R, O, C, F, B, I, oe) => ($(y) ? m = "" : $(b) ? m = `>=${y}.0.0${v ? "-0" : ""}` : $(S) ? m = `>=${y}.${b}.0${v ? "-0" : ""}` : R ? m = `>=${m}` : m = `>=${m}${v ? "-0" : ""}`, $(F) ? C = "" : $(B) ? C = `<${+F + 1}.0.0-0` : $(I) ? C = `<${F}.${+B + 1}.0-0` : oe ? C = `<=${F}.${B}.${I}-${oe}` : v ? C = `<${F}.${B}.${+I + 1}-0` : C = `<=${C}`, `${m} ${C}`.trim()), he = (v, p, m) => {
+  }, H = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[u.STAR], "")), U = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? u.GTE0PRE : u.GTE0], "")), Y = (v) => (p, m, y, b, S, E, O, C, F, x, I, oe) => ($(y) ? m = "" : $(b) ? m = `>=${y}.0.0${v ? "-0" : ""}` : $(S) ? m = `>=${y}.${b}.0${v ? "-0" : ""}` : E ? m = `>=${m}` : m = `>=${m}${v ? "-0" : ""}`, $(F) ? C = "" : $(x) ? C = `<${+F + 1}.0.0-0` : $(I) ? C = `<${F}.${+x + 1}.0-0` : oe ? C = `<=${F}.${x}.${I}-${oe}` : v ? C = `<${F}.${x}.${+I + 1}-0` : C = `<=${C}`, `${m} ${C}`.trim()), he = (v, p, m) => {
     for (let y = 0; y < v.length; y++)
       if (!v[y].test(p))
         return !1;
@@ -4270,10 +4285,10 @@ function it() {
       l = l.trim().split(/\s+/).join(" "), i("comparator", l, d), this.options = d, this.loose = !!d.loose, this.parse(l), this.semver === s ? this.value = "" : this.value = this.operator + this.semver.version, i("comp", this);
     }
     parse(l) {
-      const d = this.options.loose ? r[o.COMPARATORLOOSE] : r[o.COMPARATOR], f = l.match(d);
-      if (!f)
+      const d = this.options.loose ? r[o.COMPARATORLOOSE] : r[o.COMPARATOR], h = l.match(d);
+      if (!h)
         throw new TypeError(`Invalid comparator: ${l}`);
-      this.operator = f[1] !== void 0 ? f[1] : "", this.operator === "=" && (this.operator = ""), f[2] ? this.semver = new a(f[2], this.options.loose) : this.semver = s;
+      this.operator = h[1] !== void 0 ? h[1] : "", this.operator === "=" && (this.operator = ""), h[2] ? this.semver = new a(h[2], this.options.loose) : this.semver = s;
     }
     toString() {
       return this.value;
@@ -4388,12 +4403,12 @@ const vc = W, Is = it(), { ANY: yc } = Is, wc = te(), Sc = at, Tr = nt, Lr = Jt,
     return !1;
   for (let u = 0; u < e.set.length; ++u) {
     const l = e.set[u];
-    let d = null, f = null;
-    if (l.forEach((h) => {
-      h.semver === yc && (h = new Is(">=0.0.0")), d = d || h, f = f || h, o(h.semver, d.semver, r) ? d = h : i(h.semver, f.semver, r) && (f = h);
-    }), d.operator === a || d.operator === c || (!f.operator || f.operator === a) && n(s, f.semver))
+    let d = null, h = null;
+    if (l.forEach((f) => {
+      f.semver === yc && (f = new Is(">=0.0.0")), d = d || f, h = h || f, o(f.semver, d.semver, r) ? d = f : i(f.semver, h.semver, r) && (h = f);
+    }), d.operator === a || d.operator === c || (!h.operator || h.operator === a) && n(s, h.semver))
       return !1;
-    if (f.operator === c && i(s, f.semver))
+    if (h.operator === c && i(s, h.semver))
       return !1;
   }
   return !0;
@@ -4449,8 +4464,8 @@ const Nr = te(), Ht = it(), { ANY: gt } = Ht, Re = at, Wt = ee, Nc = (s, e, t =
   }
   const r = /* @__PURE__ */ new Set();
   let o, n;
-  for (const h of s)
-    h.operator === ">" || h.operator === ">=" ? o = xr(o, h, t) : h.operator === "<" || h.operator === "<=" ? n = jr(n, h, t) : r.add(h.semver);
+  for (const f of s)
+    f.operator === ">" || f.operator === ">=" ? o = xr(o, f, t) : f.operator === "<" || f.operator === "<=" ? n = jr(n, f, t) : r.add(f.semver);
   if (r.size > 1)
     return null;
   let i;
@@ -4460,35 +4475,35 @@ const Nr = te(), Ht = it(), { ANY: gt } = Ht, Re = at, Wt = ee, Nc = (s, e, t =
     if (i === 0 && (o.operator !== ">=" || n.operator !== "<="))
       return null;
   }
-  for (const h of r) {
-    if (o && !Re(h, String(o), t) || n && !Re(h, String(n), t))
+  for (const f of r) {
+    if (o && !Re(f, String(o), t) || n && !Re(f, String(n), t))
       return null;
-    for (const E of e)
-      if (!Re(h, String(E), t))
+    for (const R of e)
+      if (!Re(f, String(R), t))
         return !1;
     return !0;
   }
-  let a, c, u, l, d = n && !t.includePrerelease && n.semver.prerelease.length ? n.semver : !1, f = o && !t.includePrerelease && o.semver.prerelease.length ? o.semver : !1;
+  let a, c, u, l, d = n && !t.includePrerelease && n.semver.prerelease.length ? n.semver : !1, h = o && !t.includePrerelease && o.semver.prerelease.length ? o.semver : !1;
   d && d.prerelease.length === 1 && n.operator === "<" && d.prerelease[0] === 0 && (d = !1);
-  for (const h of e) {
-    if (l = l || h.operator === ">" || h.operator === ">=", u = u || h.operator === "<" || h.operator === "<=", o) {
-      if (f && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === f.major && h.semver.minor === f.minor && h.semver.patch === f.patch && (f = !1), h.operator === ">" || h.operator === ">=") {
-        if (a = xr(o, h, t), a === h && a !== o)
+  for (const f of e) {
+    if (l = l || f.operator === ">" || f.operator === ">=", u = u || f.operator === "<" || f.operator === "<=", o) {
+      if (h && f.semver.prerelease && f.semver.prerelease.length && f.semver.major === h.major && f.semver.minor === h.minor && f.semver.patch === h.patch && (h = !1), f.operator === ">" || f.operator === ">=") {
+        if (a = xr(o, f, t), a === f && a !== o)
           return !1;
-      } else if (o.operator === ">=" && !Re(o.semver, String(h), t))
+      } else if (o.operator === ">=" && !Re(o.semver, String(f), t))
         return !1;
     }
     if (n) {
-      if (d && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === d.major && h.semver.minor === d.minor && h.semver.patch === d.patch && (d = !1), h.operator === "<" || h.operator === "<=") {
-        if (c = jr(n, h, t), c === h && c !== n)
+      if (d && f.semver.prerelease && f.semver.prerelease.length && f.semver.major === d.major && f.semver.minor === d.minor && f.semver.patch === d.patch && (d = !1), f.operator === "<" || f.operator === "<=") {
+        if (c = jr(n, f, t), c === f && c !== n)
           return !1;
-      } else if (n.operator === "<=" && !Re(n.semver, String(h), t))
+      } else if (n.operator === "<=" && !Re(n.semver, String(f), t))
         return !1;
     }
-    if (!h.operator && (n || o) && i !== 0)
+    if (!f.operator && (n || o) && i !== 0)
       return !1;
   }
-  return !(o && u && !n && i !== 0 || n && l && !o && i !== 0 || f || d);
+  return !(o && u && !n && i !== 0 || n && l && !o && i !== 0 || h || d);
 }, xr = (s, e, t) => {
   if (!s)
     return e;
@@ -4618,30 +4633,30 @@ class Ol extends ro {
                 d = l[0].update;
                 break;
               case "major":
-                d = (r = l.find((E) => E.type !== "major")) == null ? void 0 : r.update;
+                d = (r = l.find((R) => R.type !== "major")) == null ? void 0 : r.update;
                 break;
               case "minor":
-                d = (o = l.find((E) => E.type === "patch")) == null ? void 0 : o.update;
+                d = (o = l.find((R) => R.type === "patch")) == null ? void 0 : o.update;
                 break;
             }
-            const f = l.map(({ type: E, update: g }) => ({
-              type: E,
+            const h = l.map(({ type: R, update: g }) => ({
+              type: R,
               update: { ...n, id: { ...n.id, version: g } }
             }));
-            if (d === void 0) return { suggestions: f };
+            if (d === void 0) return { suggestions: h };
             if (a !== void 0 && Cl.lte(d, a))
-              return { suggestions: f };
-            const h = {
+              return { suggestions: h };
+            const f = {
               ...n,
               id: { ...n.id, version: d }
             };
             return (async () => {
               try {
-                await c.getComponents(h.id);
-              } catch (E) {
-                this.logger.warn(E);
+                await c.getComponents(f.id);
+              } catch (R) {
+                this.logger.warn(R);
               }
-            })(), { suggestions: f, mainSuggestion: h };
+            })(), { suggestions: h, mainSuggestion: f };
           } catch (i) {
             return this.logger.warn(i), { suggestions: [] };
           }
@@ -4964,7 +4979,7 @@ function Ae(s) {
         secondary: s.secondary.map((e) => Ae(e))
       };
     default:
-      _(s);
+      K(s);
   }
 }
 function Tl(s) {
@@ -5041,7 +5056,7 @@ async function Dl(s, e, t) {
     a,
     c,
     r.uploadDriverOps
-  ), f = new wo(r.logger, i, r.logStreamDriverOps), h = new So(r.logger, f, u), E = await bo.init(
+  ), h = new wo(r.logger, i, r.logStreamDriverOps), f = new So(r.logger, h, u), R = await bo.init(
     r.logger,
     s,
     o,
@@ -5052,8 +5067,8 @@ async function Dl(s, e, t) {
   return {
     blobDriver: u,
     blobToURLDriver: l,
-    logDriver: h,
-    lsDriver: E,
+    logDriver: f,
+    lsDriver: R,
     signer: o,
     uploadDriver: d,
     pFrameDriver: g
@@ -5081,7 +5096,7 @@ class Fs {
   async createProject(e, t = ye()) {
     const r = await this.pl.withWriteTx("MLCreateProject", async (o) => {
       const n = await bn(o, e);
-      return o.createField(j(this.projectListResourceId, t), "Dynamic", n), await o.commit(), await Qs(n);
+      return o.createField(V(this.projectListResourceId, t), "Dynamic", n), await o.commit(), await Qs(n);
     });
     return await this.projectListTree.refreshState(), r;
   }
@@ -5095,12 +5110,12 @@ class Fs {
    * destruction of all attached objects, like files, analysis results etc. */
   async deleteProject(e) {
     await this.pl.withWriteTx("MLRemoveProject", async (t) => {
-      t.removeField(j(this.projectListResourceId, e)), await t.commit();
+      t.removeField(V(this.projectListResourceId, e)), await t.commit();
     }), await this.projectListTree.refreshState();
   }
   async projectIdToResourceId(e) {
     return await this.pl.withReadTx("Project id to resource id", async (t) => {
-      const r = (await t.getField(j(this.projectListResourceId, e))).value;
+      const r = (await t.getField(V(this.projectListResourceId, e))).value;
       if (Ye(r)) throw new Error("Unexpected project list structure.");
       return r;
     });
@@ -5151,12 +5166,12 @@ class Fs {
     };
     o.defaultTreeOptions.logStat = ce().logTreeStats, o.debugOps.dumpInitialTreeState = ce().dumpInitialTreeState;
     const n = await e.withWriteTx("MLInitialization", async (g) => {
-      const N = j(g.clientRoot, _o);
-      g.createField(N, "Dynamic");
-      const T = await g.getField(N);
+      const B = V(g.clientRoot, _o);
+      g.createField(B, "Dynamic");
+      const T = await g.getField(B);
       if (Ye(T.value)) {
-        const V = g.createEphemeral(ss);
-        return g.lock(V), g.setField(N, V), await g.commit(), await V.globalId;
+        const N = g.createEphemeral(ss);
+        return g.lock(N), g.setField(B, N), await g.commit(), await N.globalId;
       } else
         return T.value;
     }), i = o.logger, a = await Dl(e, t, o), c = new Vs(e.httpDispatcher, {
@@ -5170,7 +5185,7 @@ class Fs {
       i,
       e.httpDispatcher,
       o.frontendDownloadPath
-    ), f = {
+    ), h = {
       pl: e,
       signer: a.signer,
       logger: i,
@@ -5186,16 +5201,16 @@ class Fs {
         preferredUpdateChannel: o.preferredUpdateChannel
       }),
       quickJs: await lo()
-    }, h = new so([]), E = await Ho(e, n, h, f);
+    }, f = new so([]), R = await Ho(e, n, f, h);
     return new Fs(
-      f,
+      h,
       a,
       a.signer,
       n,
-      h,
-      E.tree,
+      f,
+      R.tree,
       u,
-      E.computable
+      R.computable
     );
   }
 }
@@ -5257,9 +5272,9 @@ async function Su(s, e = {}) {
   }, r = [];
   Nl.forEach((c) => {
     Co(c).subscribe((l) => {
-      var f;
+      var h;
       const d = (/* @__PURE__ */ new Date()).toISOString();
-      (f = l == null ? void 0 : l.response) != null && f.headers && (l.response.headers = l.response.headers.map((h) => h.toString())), r.push(
+      (h = l == null ? void 0 : l.response) != null && h.headers && (l.response.headers = l.response.headers.map((f) => f.toString())), r.push(
         JSON.stringify({
           timestamp: d,
           event: c,