@milaboratories/pl-middle-layer 1.25.6 → 1.26.1

package/dist/index.mjs

@@ -16,7 +16,7 @@ import { tryResolve as As } from "@milaboratories/resolve-helper";
 import { resourceTypesEqual as ce, field as j, Pl as L, PlClient as Ls, isNullResourceId as He, ensureResourceIdNotNull as gt, isResource as Ns, isResourceRef as Ds, isNotNullResourceId as _t, resourceType as Le, resourceTypeToString as Bs, resourceIdToString as Br, isNotFoundError as js, isTimeoutOrCancelError as xs, toGlobalResourceId as Vs, plAddressToConfig as Us, UnauthenticatedPlClient as Kt } from "@milaboratories/pl-client";
 export * from "@milaboratories/pl-client";
 import { SynchronizedTreeState as jr, PlError as Js, isPlTreeNodeAccessor as Gs } from "@milaboratories/pl-tree";
-import { Computable as V, ChangeSource as Ht, PollComputablePool as Ms, WatchableValue as _s } from "@milaboratories/computable";
+import { Computable as U, ChangeSource as Ht, PollComputablePool as Ms, WatchableValue as _s } from "@milaboratories/computable";
 import { randomUUID as Fe, createHash as Ne } from "node:crypto";
 import { parseTemplate as Ks, PlTemplateV1 as ne, PlTemplateOverrideV1 as Pe, PlTemplateLibV1 as Be, PlTemplateSoftwareV1 as be } from "@milaboratories/pl-model-backend";
 import xr from "denque";
@@ -109,9 +109,9 @@ class Ul {
           `${r.url}/${ue.GlobalOverviewPath}`,
           o
         )).body.json();
-        for (const c of i) {
-          const { organization: a, package: l, latestMeta: u, latestVersion: d } = c, f = {
-            organization: a,
+        for (const a of i) {
+          const { organization: c, package: l, latestMeta: u, latestVersion: d } = a, f = {
+            organization: c,
             name: l,
             version: d
           }, h = {
@@ -120,7 +120,7 @@ class Ul {
               title: u.title ?? "No title",
               description: u.description ?? "No Description",
               organization: {
-                name: a,
+                name: c,
                 url: "https://unknown.com"
               }
             },
@@ -137,32 +137,32 @@ class Ul {
               [we]: h,
               [ie]: h
             },
-            allVersions: c.allVersions.map((g) => ({ version: g, channels: [] }))
+            allVersions: a.allVersions.map((g) => ({ version: g, channels: [] }))
           });
         }
         return t;
       case "remote-v2":
         return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map(
-          (c) => c.latestByChannel[ie] ? {
-            ...c,
+          (a) => a.latestByChannel[ie] ? {
+            ...a,
             registryId: e.id
           } : {
-            ...c,
+            ...a,
             latestByChannel: {
-              ...c.latestByChannel,
-              [ie]: ((a) => a.spec.type === "from-registry-v2" ? { ...a, spec: { ...a.spec, channel: ie } } : a)(c.latestByChannel[we])
+              ...a.latestByChannel,
+              [ie]: ((c) => c.spec.type === "from-registry-v2" ? { ...c, spec: { ...c.spec, channel: ie } } : c)(a.latestByChannel[we])
             },
             registryId: e.id
           }
         );
       case "local-dev":
-        for (const c of await z.promises.readdir(r.path, { withFileTypes: !0 })) {
-          if (!c.isDirectory()) continue;
-          const a = H.join(r.path, c.name), l = await fo(
-            H.join(a, ue.PlPackageYamlConfigFile)
+        for (const a of await z.promises.readdir(r.path, { withFileTypes: !0 })) {
+          if (!a.isDirectory()) continue;
+          const c = H.join(r.path, a.name), l = await fo(
+            H.join(c, ue.PlPackageYamlConfigFile)
           );
           if (l !== void 0) {
-            const u = ue.PlPackageConfigData.parse(Is.parse(l)), d = await Jr(a), f = {
+            const u = ue.PlPackageConfigData.parse(Is.parse(l)), d = await Jr(c), f = {
               organization: u.organization,
               name: u.package,
               version: "DEV"
@@ -178,7 +178,7 @@ class Ul {
               },
               spec: {
                 type: "dev-v2",
-                folder: a,
+                folder: c,
                 mtime: d
               }
             };
@@ -192,10 +192,10 @@ class Ul {
               allVersions: []
             });
           } else {
-            let u = a, d = await ft(u);
+            let u = c, d = await ft(u);
             if (d === void 0) {
               for (const f of ["block", "meta"])
-                if (u = H.join(a, f), d = await ft(u), d !== void 0) break;
+                if (u = H.join(c, f), d = await ft(u), d !== void 0) break;
             }
             if (d !== void 0) {
               const f = await $t(d), h = {
@@ -232,7 +232,7 @@ class Ul {
   }
   async getOverview(e, t, r) {
     var i;
-    const o = (i = this.registries.find((c) => c.id === e)) == null ? void 0 : i.spec;
+    const o = (i = this.registries.find((a) => a.id === e)) == null ? void 0 : i.spec;
     if (!o) throw new Error(`Registry with id "${e}" not found`);
     if (o.type !== "remote-v2")
       throw new Error(
@@ -287,7 +287,7 @@ const ko = "__serviceTemplate_";
 function St(s) {
   return `${ko}${s}`;
 }
-function U(s, e) {
+function V(s, e) {
   return `${s}-${e}`;
 }
 const Po = /^(?<blockId>.*)-(?<fieldName>blockPack|blockSettings|prodArgs|currentArgs|prodCtx|prodUiCtx|prodOutput|prodCtxPrevious|prodUiCtxPrevious|prodOutputPrevious|stagingCtx|stagingUiCtx|stagingOutput|stagingCtxPrevious|stagingUiCtxPrevious|stagingOutputPrevious)$/;
@@ -308,12 +308,12 @@ async function Fo(s, e, t, r) {
     },
     r.logger
   );
-  return { computable: V.make((i) => {
-    const c = i.accessor(o.entry()).node(), a = t.getValue(i);
-    if (c === void 0) return;
+  return { computable: U.make((i) => {
+    const a = i.accessor(o.entry()).node(), c = t.getValue(i);
+    if (a === void 0) return;
     const l = [];
-    for (const u of c.listDynamicFields()) {
-      const d = c.traverse(u);
+    for (const u of a.listDynamicFields()) {
+      const d = a.traverse(u);
       if (d === void 0) continue;
       const f = B(d.getKeyValueAsJson(Ae)), h = B(d.getKeyValueAsJson(It)), g = B(d.getKeyValueAsJson(Te));
       l.push({
@@ -321,7 +321,7 @@ async function Fo(s, e, t, r) {
         rid: d.id,
         created: new Date(h),
         lastModified: new Date(g),
-        opened: a.indexOf(d.id) >= 0,
+        opened: c.indexOf(d.id) >= 0,
         meta: f
       });
     }
@@ -337,8 +337,8 @@ const To = {
 };
 function Kr(s, e, t, r, o) {
   if (o.length === 0) throw new Error("Zero output names provided");
-  const n = t ? s.createEphemeral(To) : s.createStruct(Ao), i = j(n, "template"), c = j(n, "inputs");
-  return s.createField(i, "Input", e), s.createField(c, "Input", L.createPlMap(s, r, t)), s.lockInputs(n), L.futureRecord(s, n, o, "Output", "outputs/");
+  const n = t ? s.createEphemeral(To) : s.createStruct(Ao), i = j(n, "template"), a = j(n, "inputs");
+  return s.createField(i, "Input", e), s.createField(a, "Input", L.createPlMap(s, r, t)), s.lockInputs(n), L.futureRecord(s, n, o, "Output", "outputs/");
 }
 const Lo = { name: "BContextEnd", version: "1" }, No = { name: "BContext", version: "1" }, Do = "id", Bo = "parent/", jo = ["context", "result"];
 function zt(s, e, t) {
@@ -412,21 +412,21 @@ const Yt = {
       ne.type,
       JSON.stringify(ne.fromV2Data(s).data)
     );
-    for (const [i, c] of Object.entries(s.libs ?? {})) {
-      const a = ne.libField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Yt));
+    for (const [i, a] of Object.entries(s.libs ?? {})) {
+      const c = ne.libField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, Yt));
     }
-    for (const [i, c] of Object.entries(s.software ?? {})) {
-      const a = ne.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, je));
+    for (const [i, a] of Object.entries(s.software ?? {})) {
+      const c = ne.swField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, je));
     }
-    for (const [i, c] of Object.entries(s.assets ?? {})) {
-      const a = ne.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, je));
+    for (const [i, a] of Object.entries(s.assets ?? {})) {
+      const c = ne.swField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, je));
     }
-    for (const [i, c] of Object.entries(s.templates ?? {})) {
-      const a = ne.tplField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Hr));
+    for (const [i, a] of Object.entries(s.templates ?? {})) {
+      const c = ne.tplField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, Hr));
     }
     if (e.lock(r), !s.hashOverride) return r;
     const o = t(s, Jo), n = Pe.tplField(o);
@@ -437,12 +437,12 @@ function Go(s, e) {
   const t = /* @__PURE__ */ new Map(), r = (o, n) => {
     const i = Ne("sha256");
     n.hash(o, i);
-    const c = i.digest("hex");
-    if (!t.has(c)) {
-      const a = n.render(o, s, r);
-      t.set(c, a);
+    const a = i.digest("hex");
+    if (!t.has(a)) {
+      const c = n.render(o, s, r);
+      t.set(a, c);
     }
-    return t.get(c);
+    return t.get(a);
   };
   return r(e, Hr);
 }
@@ -587,14 +587,14 @@ class Yo {
           throw new Error(
             `Block not found in registry (url = ${o} ; code = ${n.statusCode}): ` + JSON.stringify(e)
           );
-        const i = new Uint8Array(await n.body.arrayBuffer()), a = await (await ae(`${r}/config.json`, t)).body.json();
+        const i = new Uint8Array(await n.body.arrayBuffer()), c = await (await ae(`${r}/config.json`, t)).body.json();
         return {
           type: "explicit",
           template: {
             type: "explicit",
             content: i
           },
-          config: a,
+          config: c,
           frontend: {
             type: "url",
             url: `${r}/frontend.tgz`
@@ -603,14 +603,14 @@ class Yo {
         };
       }
       case "from-registry-v2": {
-        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, o = await this.v2RegistryProvider.getRegistry(e.registryUrl).getComponents(e.id), n = async () => await (await ae(o.model.url, t)).body.json(), i = async () => await (await ae(o.workflow.main.url, t)).body.arrayBuffer(), [c, a] = await Promise.all([n(), i()]);
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, o = await this.v2RegistryProvider.getRegistry(e.registryUrl).getComponents(e.id), n = async () => await (await ae(o.model.url, t)).body.json(), i = async () => await (await ae(o.workflow.main.url, t)).body.arrayBuffer(), [a, c] = await Promise.all([n(), i()]);
         return {
           type: "explicit",
           template: {
             type: "explicit",
-            content: Buffer.from(a)
+            content: Buffer.from(c)
           },
-          config: c,
+          config: a,
           frontend: {
             type: "url",
             url: o.ui.url
@@ -697,9 +697,9 @@ class Yr {
     const n = new Set(o);
     for (; o.length > 0; ) {
       let i = [];
-      for (const c of o) {
-        const a = this.nodes.get(c);
-        r(a), a[e].forEach((l) => {
+      for (const a of o) {
+        const c = this.nodes.get(a);
+        r(c), c[e].forEach((l) => {
           n.has(l) || (n.add(l), i.push(l));
         });
       }
@@ -724,14 +724,14 @@ function Ke(s, e) {
   for (const { id: o } of te(s)) {
     const n = e(o);
     if (n === void 0) continue;
-    const i = en(n, r), c = {
+    const i = en(n, r), a = {
       id: o,
       missingReferences: i.missingReferences,
       upstream: i.upstreams,
       downstream: /* @__PURE__ */ new Set()
       // will be populated from downstream blocks
     };
-    t.set(o, c), i.upstreams.forEach((a) => t.get(a).downstream.add(o)), r.add(o);
+    t.set(o, a), i.upstreams.forEach((c) => t.get(c).downstream.add(o)), r.add(o);
   }
   return new Yr(t);
 }
@@ -849,7 +849,7 @@ const sn = (s) => {
   throw new Error(`No new block info for ${s}`);
 };
 class qe {
-  constructor(e, t, r, o, n, i, c, a, l, u, d, f) {
+  constructor(e, t, r, o, n, i, a, c, l, u, d, f) {
     S(this, "globalModCount", 0);
     S(this, "fieldsChanged", !1);
     //
@@ -868,7 +868,7 @@ class qe {
     S(this, "stagingGraph");
     S(this, "pendingProductionGraph");
     S(this, "actualProductionGraph");
-    this.rid = e, this.tx = t, this.author = r, this.schema = o, this.lastModified = n, this.meta = i, this.struct = c, this.renderingState = a, this.blocksInLimbo = l, this.blockInfos = u, 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 = l, this.blockInfos = u, this.blockFrontendStates = d, this.ctxExportTplHolder = f;
   }
   fixProblemsAndMigrate() {
     this.blockInfos.forEach((t) => {
@@ -920,7 +920,7 @@ class qe {
     throw new Error("block not found");
   }
   setBlockFieldObj(e, t, r) {
-    const o = j(this.rid, U(e, t));
+    const o = j(this.rid, V(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++,
@@ -935,7 +935,7 @@ class qe {
     const o = this.getBlockInfo(e);
     for (const n of t) {
       const i = o.fields;
-      n in i && (this.tx.removeField(j(this.rid, U(e, n))), delete i[n], this.fieldsChanged = !0, r = !0);
+      n in i && (this.tx.removeField(j(this.rid, V(e, n))), delete i[n], this.fieldsChanged = !0, r = !0);
     }
     return r;
   }
@@ -973,8 +973,8 @@ class qe {
       JSON.parse(o);
       const i = Buffer.from(o);
       if (Buffer.compare(n.fields.currentArgs.value, i) === 0) continue;
-      const c = this.tx.createValue(L.JsonObject, i);
-      this.setBlockField(r, "currentArgs", c, "Ready", i), this.blocksWithChangedInputs.add(r), t.push(r);
+      const a = this.tx.createValue(L.JsonObject, i);
+      this.setBlockField(r, "currentArgs", a, "Ready", i), this.blocksWithChangedInputs.add(r), t.push(r);
     }
     this.getStagingGraph().traverse("downstream", t, ({ id: r }) => this.resetStaging(r)), t.length > 0 && this.updateLastModified();
   }
@@ -1060,12 +1060,12 @@ class qe {
         var u;
         return (u = this.blockInfos.get(l)) == null ? void 0 : u.actualProductionInputs;
       }
-    ), c = er(r, n), a = er(o, i);
-    for (const l of c.onlyInA) {
+    ), a = er(r, n), c = er(o, i);
+    for (const l of a.onlyInA) {
       const { fields: u } = this.getBlockInfo(l);
       this.deleteBlockFields(l, ...Object.keys(u)), this.blockInfos.delete(l), this.blocksInLimbo.delete(l) && (this.renderingStateChanged = !0), this.blockFrontendStates.delete(l) && this.changedBlockFrontendStates.add(l);
     }
-    for (const l of c.onlyInB) {
+    for (const l of a.onlyInB) {
       const u = new tr(l, {});
       this.blockInfos.set(l, u);
       const d = t(l), f = Zt(this.tx, d.blockPack);
@@ -1075,10 +1075,10 @@ class qe {
         this.createJsonFieldValue(Gt)
       ), this.setBlockFieldObj(l, "currentArgs", this.createJsonFieldValueByContent(d.args)), d.uiState && (this.blockFrontendStates.set(l, d.uiState), this.changedBlockFrontendStates.add(l)), u.check();
     }
-    for (const l of c.different) this.resetStaging(l);
-    o.traverse("downstream", [...a.different], (l) => {
+    for (const l of a.different) this.resetStaging(l);
+    o.traverse("downstream", [...c.different], (l) => {
       this.resetOrLimboProduction(l.id);
-    }), (c.onlyInB.size > 0 || c.onlyInA.size > 0 || c.different.size > 0) && this.resetStagingRefreshTimestamp(), this.struct = e, this.structureChanged = !0, this.stagingGraph = void 0, this.pendingProductionGraph = void 0, this.actualProductionGraph = void 0, this.updateLastModified();
+    }), (a.onlyInB.size > 0 || a.onlyInA.size > 0 || a.different.size > 0) && this.resetStagingRefreshTimestamp(), this.struct = e, this.structureChanged = !0, this.stagingGraph = void 0, this.pendingProductionGraph = void 0, this.actualProductionGraph = void 0, this.updateLastModified();
   }
   //
   // Structure change helpers
@@ -1090,9 +1090,9 @@ class qe {
     else {
       let n = !1;
       for (const i of o.groups) {
-        const c = i.blocks.findIndex((a) => a.id === r);
-        if (!(c < 0)) {
-          i.blocks.splice(c, 0, e), n = !0;
+        const a = i.blocks.findIndex((c) => c.id === r);
+        if (!(a < 0)) {
+          i.blocks.splice(a, 0, e), n = !0;
           break;
         }
       }
@@ -1143,24 +1143,24 @@ class qe {
       });
     else
       for (const i of r) {
-        const c = o.nodes.get(i);
-        if (c === void 0) throw new Error(`Can't find block with id: ${i}`);
-        for (const a of c.upstream)
-          if (!r.has(a))
+        const a = o.nodes.get(i);
+        if (a === void 0) throw new Error(`Can't find block with id: ${i}`);
+        for (const c of a.upstream)
+          if (!r.has(c))
             throw new Error("Can't render blocks not including all upstreams.");
       }
     const n = /* @__PURE__ */ new Set();
     for (const i of te(this.structure)) {
       if (!r.has(i.id)) continue;
-      let c = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
-      if (!c) {
-        for (const a of o.nodes.get(i.id).upstream)
-          if (n.has(a)) {
-            c = !0;
+      let a = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
+      if (!a) {
+        for (const c of o.nodes.get(i.id).upstream)
+          if (n.has(c)) {
+            a = !0;
             break;
           }
       }
-      c && (this.renderProductionFor(i.id), n.add(i.id));
+      a && (this.renderProductionFor(i.id), n.add(i.id));
     }
     return o.traverse("downstream", [...n], (i) => {
       n.has(i.id) || this.resetOrLimboProduction(i.id);
@@ -1169,26 +1169,26 @@ class qe {
   /** Stops running blocks from the list and modify states of other blocks
    * accordingly */
   stopProduction(...e) {
-    var i, c;
+    var i, a;
     const t = this.getActualProductionGraph(), r = new xr(e), o = new Set(e), n = [];
     for (; !r.isEmpty(); ) {
-      const a = r.shift(), l = this.getBlockInfo(a).fields;
-      if (!(((i = l.prodOutput) == null ? void 0 : i.status) === "Ready" && ((c = l.prodCtx) == null ? void 0 : c.status) === "Ready") && this.deleteBlockFields(a, "prodOutput", "prodCtx", "prodUiCtx", "prodArgs")) {
-        n.push(a);
-        for (const u of t.traverseIdsExcludingRoots("downstream", a))
+      const c = r.shift(), l = this.getBlockInfo(c).fields;
+      if (!(((i = l.prodOutput) == null ? void 0 : i.status) === "Ready" && ((a = l.prodCtx) == null ? void 0 : a.status) === "Ready") && this.deleteBlockFields(c, "prodOutput", "prodCtx", "prodUiCtx", "prodArgs")) {
+        n.push(c);
+        for (const u of t.traverseIdsExcludingRoots("downstream", c))
           o.has(u) || (r.push(u), o.add(u));
       }
     }
-    for (const a of t.traverseIdsExcludingRoots("downstream", ...n))
-      this.resetOrLimboProduction(a);
+    for (const c of t.traverseIdsExcludingRoots("downstream", ...n))
+      this.resetOrLimboProduction(c);
   }
   traverseWithStagingLag(e) {
     const t = /* @__PURE__ */ new Map();
     this.getStagingGraph().nodes.forEach((o) => {
       let i = this.getBlockInfo(o.id).stagingRendered ? 0 : 1;
-      o.upstream.forEach((c) => {
-        const a = t.get(c);
-        a !== 0 && (i = Math.max(a + 1, i));
+      o.upstream.forEach((a) => {
+        const c = t.get(a);
+        c !== 0 && (i = Math.max(c + 1, i));
       }), e(o.id, i), t.set(o.id, i);
     });
   }
@@ -1251,7 +1251,7 @@ class qe {
     }
   }
   static async load(e, t, r) {
-    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Gr), i = e.getKValueJson(t, Te), c = e.getKValueJson(t, Ae), a = e.getKValueJson(t, de), l = e.getKValueJson(t, We), u = e.listKeyValuesString(t), [
+    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Gr), i = e.getKValueJson(t, Te), a = e.getKValueJson(t, Ae), c = e.getKValueJson(t, de), l = e.getKValueJson(t, We), u = e.listKeyValuesString(t), [
       d,
       f,
       h,
@@ -1263,8 +1263,8 @@ class qe {
       o,
       n,
       i,
-      c,
       a,
+      c,
       l,
       u
     ]);
@@ -1436,9 +1436,9 @@ function hn(s) {
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
       if (i === void 0) throw new Error(`no partition keys for super key ${o}`);
-      for (const c of i) {
-        const a = JSON.stringify([...JSON.parse(o), ...JSON.parse(c)]);
-        r[a] = n.traverse({ field: c, errorIfFieldNotSet: !0 }).resourceInfo;
+      for (const a of i) {
+        const c = JSON.stringify([...JSON.parse(o), ...JSON.parse(a)]);
+        r[c] = n.traverse({ field: a, errorIfFieldNotSet: !0 }).resourceInfo;
       }
     }
     return {
@@ -1472,22 +1472,22 @@ function hn(s) {
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
       if (i === void 0) throw new Error(`no partition keys for super key ${o}`);
-      for (const c of i)
-        if (c.endsWith(".index")) {
-          const a = c.slice(0, c.length - 6), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(a)]);
+      for (const a of i)
+        if (a.endsWith(".index")) {
+          const c = a.slice(0, a.length - 6), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(c)]);
           let u = r[l];
           u === void 0 && (u = {}, r[l] = u), r[l].index = n.traverse({
-            field: c,
+            field: a,
             errorIfFieldNotSet: !0
           }).resourceInfo;
-        } else if (c.endsWith(".values")) {
-          const a = c.slice(0, c.length - 7), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(a)]);
+        } else if (a.endsWith(".values")) {
+          const c = a.slice(0, a.length - 7), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(c)]);
           let u = r[l];
           u === void 0 && (u = {}, r[l] = u), r[l].values = n.traverse({
-            field: c,
+            field: a,
             errorIfFieldNotSet: !0
           }).resourceInfo;
-        } else throw new Error(`unrecognized part field name: ${c}`);
+        } else throw new Error(`unrecognized part field name: ${a}`);
     }
     return {
       type: "BinaryPartitioned",
@@ -1521,7 +1521,7 @@ function mn(s, e) {
   return re({ resolvePath: s, name: e });
 }
 function Zr(s, e = !0, t = !1, r = "") {
-  var c, a, l;
+  var a, c, l;
   const o = /^(?<name>.*)\.(?<type>spec|data)$/, n = /* @__PURE__ */ new Map();
   for (const u of s.listInputFields()) {
     const d = u.match(o);
@@ -1529,13 +1529,13 @@ function Zr(s, e = !0, t = !1, r = "") {
       if (e) throw new Error(`unexpected field name ${u}`);
       continue;
     }
-    let f = B((c = d.groups) == null ? void 0 : c.name);
+    let f = B((a = d.groups) == null ? void 0 : a.name);
     if (!f.startsWith(r)) {
       if (e) throw new Error(`unexpected field name ${u}`);
       continue;
     }
     f = f.slice(r.length);
-    const h = B((a = d.groups) == null ? void 0 : a.type);
+    const h = B((c = d.groups) == null ? void 0 : c.type);
     let g = n.get(f);
     switch (g === void 0 && (g = {}, n.set(f, g)), h) {
       case "spec":
@@ -1564,17 +1564,17 @@ function vn(s, e = !0, t = "", r) {
   const o = Zr(s, e, !1, t);
   Ws(o.locked);
   const n = {};
-  for (const [i, c] of o.results) {
-    if (c.spec === void 0) throw new Error(`no spec for key ${i}`);
-    if (c.hasData !== !0 || c.data === void 0)
+  for (const [i, a] of o.results) {
+    if (a.spec === void 0) throw new Error(`no spec for key ${i}`);
+    if (a.hasData !== !0 || a.data === void 0)
       throw new Error(`no data for key ${i}`);
-    const a = c.data();
-    if (a === void 0) throw new Error(`no data for key ${i}`);
-    if (!a.ok) throw new Js(a.error);
+    const c = a.data();
+    if (c === void 0) throw new Error(`no data for key ${i}`);
+    if (!c.ok) throw new Js(c.error);
     n[i] = {
-      id: r.length === 0 ? gn(c.spec, a.value) : mn(r, i),
-      spec: c.spec,
-      data: a.value
+      id: r.length === 0 ? gn(a.spec, c.value) : mn(r, i),
+      spec: a.spec,
+      data: c.value
     };
   }
   return n;
@@ -1600,18 +1600,18 @@ class Tt {
     this.allSpecsAvailable = r;
   }
   getSpecByRef(e, t) {
-    var n, i, c, a, l, u;
+    var n, i, a, c, l, u;
     const r = this.blocks.get(e);
     if (r === void 0) return;
-    let o = (c = (i = (n = r.prod) == null ? void 0 : n.results) == null ? void 0 : i.get(t)) == null ? void 0 : c.spec;
-    if (o !== void 0 || (o = (u = (l = (a = r.staging) == null ? void 0 : a.results) == null ? void 0 : l.get(t)) == null ? void 0 : u.spec, o !== void 0)) return o;
+    let o = (a = (i = (n = r.prod) == null ? void 0 : n.results) == null ? void 0 : i.get(t)) == null ? void 0 : a.spec;
+    if (o !== void 0 || (o = (u = (l = (c = r.staging) == null ? void 0 : c.results) == null ? void 0 : l.get(t)) == null ? void 0 : u.spec, o !== void 0)) return o;
     r.staging === void 0 ? this.ctx.markUnstable(`staging_not_rendered:${e}`) : r.staging.locked ? r.prod !== void 0 && !r.prod.locked && this.ctx.markUnstable(`prod_not_locked:${e}`) : this.ctx.markUnstable(`staging_not_locked:${e}`);
   }
   getDataOrErrorByRef(e, t) {
-    var i, c, a;
+    var i, a, c;
     const r = this.blocks.get(e);
     if (r === void 0) return;
-    let o = (c = (i = r.prod) == null ? void 0 : i.results) == null ? void 0 : c.get(t), n = (a = o == null ? void 0 : o.data) == null ? void 0 : a.call(o);
+    let o = (a = (i = r.prod) == null ? void 0 : i.results) == null ? void 0 : a.get(t), n = (c = o == null ? void 0 : o.data) == null ? void 0 : c.call(o);
     if (o !== void 0 && o.spec !== void 0 && n !== void 0)
       return Tr(n, (l) => ({
         id: sr(e, t),
@@ -1647,30 +1647,30 @@ class Tt {
     let t = !0, r;
     const o = (i) => {
       r === void 0 && (r = i), t = !1;
-    }, n = (i, c, a) => {
-      if (a.spec !== void 0 && a.hasData === !0 && a.data !== void 0) {
-        const l = a.data();
+    }, n = (i, a, c) => {
+      if (c.spec !== void 0 && c.hasData === !0 && c.data !== void 0) {
+        const l = c.data();
         l !== void 0 ? e.push({
-          ref: xe(i, c),
+          ref: xe(i, a),
           obj: {
-            id: l.ok ? sr(i, c) : void 0,
-            spec: a.spec,
+            id: l.ok ? sr(i, a) : void 0,
+            spec: c.spec,
             data: l
           }
-        }) : o(`no_data:${i}:${c}`);
+        }) : o(`no_data:${i}:${a}`);
       }
     };
-    for (const [i, c] of this.blocks) {
-      const a = /* @__PURE__ */ new Set();
-      if (c.prod !== void 0) {
-        c.prod.locked || o(`prod_not_locked:${i}`);
-        for (const [l, u] of c.prod.results)
-          a.add(l), n(i, l, u);
+    for (const [i, a] of this.blocks) {
+      const c = /* @__PURE__ */ new Set();
+      if (a.prod !== void 0) {
+        a.prod.locked || o(`prod_not_locked:${i}`);
+        for (const [l, u] of a.prod.results)
+          c.add(l), n(i, l, u);
       }
-      if (c.staging !== void 0) {
-        c.staging.locked || o(`staging_not_locked:${i}`);
-        for (const [l, u] of c.staging.results)
-          a.has(l) || n(i, l, u);
+      if (a.staging !== void 0) {
+        a.staging.locked || o(`staging_not_locked:${i}`);
+        for (const [l, u] of a.staging.results)
+          c.has(l) || n(i, l, u);
       }
     }
     return { entries: e, isComplete: t, instabilityMarker: r };
@@ -1682,20 +1682,20 @@ class Tt {
       r === void 0 && (r = n), t = !1;
     };
     for (const [n, i] of this.blocks) {
-      const c = /* @__PURE__ */ new Set();
+      const a = /* @__PURE__ */ new Set();
       if (i.staging !== void 0) {
         i.staging.locked || o(`staging_not_locked:${n}`);
-        for (const [a, l] of i.staging.results)
+        for (const [c, l] of i.staging.results)
           l.spec !== void 0 && (e.push({
-            ref: xe(n, a),
+            ref: xe(n, c),
             obj: l.spec
-          }), c.add(a));
+          }), a.add(c));
       } else o(`staging_not_rendered:${n}`);
       if (i.prod !== void 0) {
         i.prod.locked || o(`prod_not_locked:${n}`);
-        for (const [a, l] of i.prod.results)
-          c.has(a) || l.spec !== void 0 && e.push({
-            ref: xe(n, a),
+        for (const [c, l] of i.prod.results)
+          a.has(c) || l.spec !== void 0 && e.push({
+            ref: xe(n, c),
             obj: l.spec
           });
       }
@@ -1706,11 +1706,11 @@ class Tt {
     const t = [];
     for (const r of this.blocks.values()) {
       const o = /* @__PURE__ */ new Set(), n = (i) => {
-        for (const [c, a] of i.results)
-          o.has(c) || a.spec === void 0 || (o.add(c), Ss(e, a.spec) && t.push({
-            label: r.info.label + " / " + c,
-            ref: xe(r.info.id, c),
-            spec: a.spec
+        for (const [a, c] of i.results)
+          o.has(a) || c.spec === void 0 || (o.add(a), Ss(e, c.spec) && t.push({
+            label: r.info.label + " / " + a,
+            ref: xe(r.info.id, a),
+            spec: c.spec
           }));
       };
       r.staging !== void 0 && n(r.staging), r.prod !== void 0 && n(r.prod);
@@ -1718,33 +1718,33 @@ class Tt {
     return t;
   }
   static create(e, t, r) {
-    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(de)), c = Ct(n).traverseIds("upstream", r), a = /* @__PURE__ */ new Map();
+    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(de)), a = Ct(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
     for (const l of te(n)) {
-      if (!c.has(l.id)) continue;
+      if (!a.has(l.id)) continue;
       const u = or(
         o.traverse({
-          field: U(l.id, "prodCtx"),
+          field: V(l.id, "prodCtx"),
           ignoreError: !0,
           pureFieldErrorToUndefined: !0,
           stableIfNotFound: !0
         }) !== void 0,
         o.traverseOrError({
-          field: U(l.id, "prodUiCtx"),
+          field: V(l.id, "prodUiCtx"),
           stableIfNotFound: !0
         })
       ), d = or(
         o.traverse({
-          field: U(l.id, "stagingCtx"),
+          field: V(l.id, "stagingCtx"),
           ignoreError: !0,
           pureFieldErrorToUndefined: !0
         }) !== void 0,
         o.traverseOrError({
-          field: U(l.id, "stagingUiCtx")
+          field: V(l.id, "stagingUiCtx")
         })
       );
-      a.set(l.id, { info: l, prod: u, staging: d });
+      c.set(l.id, { info: l, prod: u, staging: d });
     }
-    return new Tt(e, a);
+    return new Tt(e, c);
   }
 }
 function or(s, e) {
@@ -1755,16 +1755,23 @@ function or(s, e) {
 function At(s, e) {
   return {
     blockId: e,
-    args: (o) => B(
-      o.accessor(s).node().traverse({
-        field: U(e, "currentArgs"),
+    args: (n) => B(
+      n.accessor(s).node().traverse({
+        field: V(e, "currentArgs"),
         errorIfFieldNotSet: !0
       }).getDataAsString()
     ),
-    uiState: (o) => o.accessor(s).node().getKeyValueAsString(vt(e)),
-    blockMeta: (o) => {
-      const n = o.accessor(s).node(), i = B(n.getKeyValueAsJson(de)), c = /* @__PURE__ */ new Map();
-      for (const a of te(i)) c.set(a.id, a);
+    activeArgs: (n) => {
+      var i;
+      return (i = n.accessor(s).node().traverse({
+        field: V(e, "prodArgs"),
+        stableIfNotFound: !0
+      })) == null ? void 0 : i.getDataAsString();
+    },
+    uiState: (n) => n.accessor(s).node().getKeyValueAsString(vt(e)),
+    blockMeta: (n) => {
+      const i = n.accessor(s).node(), a = B(i.getKeyValueAsJson(de)), c = /* @__PURE__ */ new Map();
+      for (const l of te(a)) c.set(l.id, l);
       return c;
     }
   };
@@ -1775,7 +1782,7 @@ function es(s, e) {
     prod: (t) => {
       var r;
       return (r = t.accessor(s).node({ ignoreError: !0 }).traverse({
-        field: U(e, "prodOutput"),
+        field: V(e, "prodOutput"),
         stableIfNotFound: !0,
         ignoreError: !0
       })) == null ? void 0 : r.persist();
@@ -1783,7 +1790,7 @@ function es(s, e) {
     staging: (t) => {
       var o;
       const r = (o = t.accessor(s).node({ ignoreError: !0 }).traverse({
-        field: U(e, "stagingOutput"),
+        field: V(e, "stagingOutput"),
         ignoreError: !0
       })) == null ? void 0 : o.persist();
       return r === void 0 && t.markUnstable("staging_not_rendered"), r;
@@ -1916,8 +1923,8 @@ function kn(s, e) {
     if (r === void 0) return k(void 0);
     const o = {};
     for (const [n, i] of Object.entries(r)) {
-      const c = { ...s, [e.itVar]: i };
-      o[n] = $(c, e.mapping);
+      const a = { ...s, [e.itVar]: i };
+      o[n] = $(a, e.mapping);
     }
     return () => ({
       type: "ScheduleSubroutine",
@@ -1953,12 +1960,12 @@ function Ln(s, e) {
     const r = t.source;
     return r === void 0 ? k(void 0) : ({ cCtx: o }) => {
       const n = o.accessor(r).node(), i = {};
-      for (const c of n.listInputFields()) {
-        const a = n.traverse(c);
-        if (a === void 0) i[c] = k(void 0);
+      for (const a of n.listInputFields()) {
+        const c = n.traverse(a);
+        if (c === void 0) i[a] = k(void 0);
         else {
-          const l = { ...s, [e.itVar]: a.persist() };
-          i[c] = $(l, e.mapping);
+          const l = { ...s, [e.itVar]: c.persist() };
+          i[a] = $(l, e.mapping);
         }
       }
       return {
@@ -1973,7 +1980,7 @@ const Nn = (s) => k(s), Dn = (s) => {
   const e = s.source;
   return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
-    computable: V.make(
+    computable: U.make(
       (r) => t.blobDriver.getDownloadedBlob(r.accessor(e).node().resourceInfo),
       {
         postprocessValue: async (r) => {
@@ -1989,7 +1996,7 @@ const Nn = (s) => k(s), Dn = (s) => {
     const o = t.accessor(e).node().resourceInfo;
     return {
       type: "ScheduleComputable",
-      computable: V.make(() => r.blobDriver.getDownloadedBlob(o), {
+      computable: U.make(() => r.blobDriver.getDownloadedBlob(o), {
         postprocessValue: async (n) => n === void 0 ? void 0 : (await r.blobDriver.getContent(n.handle)).toString()
       })
     };
@@ -1998,7 +2005,7 @@ const Nn = (s) => k(s), Dn = (s) => {
   const e = s.source;
   return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
-    computable: V.make(
+    computable: U.make(
       (r) => t.blobDriver.getDownloadedBlob(r.accessor(e).node().resourceInfo),
       {
         postprocessValue: async (r) => {
@@ -2260,28 +2267,28 @@ function qn() {
   return { pendingSubroutines: /* @__PURE__ */ new Map() };
 }
 function nr(s, e, t, r) {
-  const o = new xr(t), n = (c, a) => {
-    if (Wn(c))
-      return e.result = a, !1;
-    const l = B(e.pendingSubroutines.get(c.op));
-    if (c.arg in l.args) throw new Error("argument already set");
-    return l.args[c.arg] = a, l.argCounter--, l.argCounter === 0 && (e.pendingSubroutines.delete(c.op), o.push({
+  const o = new xr(t), n = (a, c) => {
+    if (Wn(a))
+      return e.result = c, !1;
+    const l = B(e.pendingSubroutines.get(a.op));
+    if (a.arg in l.args) throw new Error("argument already set");
+    return l.args[a.arg] = c, l.argCounter--, l.argCounter === 0 && (e.pendingSubroutines.delete(a.op), o.push({
       destination: l.destination,
       operation: l.subroutine(l.args)
     })), !0;
   }, i = [];
   e: for (; o.length > 0; ) {
-    const c = o.shift(), a = c.operation(s);
-    switch (a.type) {
+    const a = o.shift(), c = a.operation(s);
+    switch (c.type) {
       case "ReturnResult":
-        if (!n(c.destination, a.result)) break e;
+        if (!n(a.destination, c.result)) break e;
         break;
       case "ScheduleSubroutine":
-        const l = Symbol(), u = Object.entries(a.args), d = u.length;
+        const l = Symbol(), u = Object.entries(c.args), d = u.length;
         if (d === 0)
           o.push({
-            destination: c.destination,
-            operation: a.subroutine({})
+            destination: a.destination,
+            operation: c.subroutine({})
           });
         else {
           for (const [f, h] of u)
@@ -2292,8 +2299,8 @@ function nr(s, e, t, r) {
           e.pendingSubroutines.set(l, {
             argCounter: d,
             args: {},
-            subroutine: a.subroutine,
-            destination: c.destination
+            subroutine: c.subroutine,
+            destination: a.destination
           });
         }
         break;
@@ -2301,12 +2308,12 @@ function nr(s, e, t, r) {
         if (!r)
           throw new Error("asynchronous operations are forbidden in this context");
         i.push({
-          destination: c.destination,
-          computable: a.computable
+          destination: a.destination,
+          computable: c.computable
         });
         break;
       default:
-        G(a);
+        G(c);
     }
   }
   return i;
@@ -2321,13 +2328,13 @@ function ns(s, e, t, r = {}) {
     ),
     cfg: t
   });
-  return V.makeRaw(
+  return U.makeRaw(
     (n) => {
-      const i = { drivers: s, cCtx: n }, c = qn();
+      const i = { drivers: s, cCtx: n }, a = qn();
       return {
         ir: nr(
           i,
-          c,
+          a,
           [
             {
               destination: Hn,
@@ -2346,10 +2353,10 @@ function ns(s, e, t, r = {}) {
               throw new Error("asynchronous operations are forbidden in this context");
             }
           }, f = /* @__PURE__ */ new Map();
-          for (const [g, E] of c.pendingSubroutines)
+          for (const [g, E] of a.pendingSubroutines)
             f.set(g, { ...E, args: { ...E.args } });
           const h = {
-            result: c.result,
+            result: a.result,
             pendingSubroutines: f
           };
           if (nr(d, h, u, !1), !("result" in h))
@@ -2491,10 +2498,10 @@ class Xe {
   parsePObjectCollection(e, t, r, ...o) {
     const n = this.getAccessor(e);
     if (!n.getIsReadyOrError()) return;
-    const i = vn(n, t, r, o), c = {};
-    for (const [a, l] of Object.entries(i))
-      c[a] = le(l, (u) => this.wrapAccessor(u));
-    return c;
+    const i = vn(n, t, r, o), a = {};
+    for (const [c, l] of Object.entries(i))
+      a[c] = le(l, (u) => this.wrapAccessor(u));
+    return a;
   }
   //
   // Blobs
@@ -2507,7 +2514,7 @@ class Xe {
     const t = this.getAccessor(e).resourceInfo;
     return this.registerComputable(
       "getBlobContentAsString",
-      V.make((r) => this.env.driverKit.blobDriver.getDownloadedBlob(t, r), {
+      U.make((r) => this.env.driverKit.blobDriver.getDownloadedBlob(t, r), {
         postprocessValue: async (r) => {
           if (r !== void 0)
             return Buffer.from(await this.env.driverKit.blobDriver.getContent(r.handle)).toString(
@@ -2521,7 +2528,7 @@ class Xe {
     const t = this.getAccessor(e).resourceInfo;
     return this.registerComputable(
       "getBlobContentAsBase64",
-      V.make((r) => this.env.driverKit.blobDriver.getDownloadedBlob(t, r), {
+      U.make((r) => this.env.driverKit.blobDriver.getDownloadedBlob(t, r), {
         postprocessValue: async (r) => {
           if (r !== void 0)
             return Buffer.from(await this.env.driverKit.blobDriver.getContent(r.handle)).toString(
@@ -2649,10 +2656,7 @@ class Xe {
         "can't instantiate PFrames from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPFrame(
-      e.map((t) => le(
-        t,
-        (r) => typeof r == "string" ? this.getAccessor(r) : r
-      )),
+      e.map((t) => le(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)),
       this.computableCtx
     );
   }
@@ -2662,10 +2666,10 @@ class Xe {
         "can't instantiate PTable from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPTable(
-      ht(e, (t) => le(
-        t,
-        (r) => typeof r == "string" ? this.getAccessor(r) : r
-      )),
+      ht(
+        e,
+        (t) => le(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
+      ),
       this.computableCtx
     );
   }
@@ -2755,85 +2759,86 @@ class Xe {
   }
   injectCtx() {
     mt.withScope((e) => {
-      const t = e.manage(this.vm.newObject()), r = this.blockCtx.args(this.computableCtx), o = this.blockCtx.uiState(this.computableCtx);
-      this.vm.setProp(t, "args", e.manage(this.vm.newString(r))), o !== void 0 && this.vm.setProp(t, "uiState", e.manage(this.vm.newString(o))), this.vm.setProp(t, "callbackRegistry", this.callbackRegistry), this.vm.setProp(
+      const t = e.manage(this.vm.newObject()), r = this.blockCtx.args(this.computableCtx), o = this.blockCtx.activeArgs(this.computableCtx), n = this.blockCtx.uiState(this.computableCtx);
+      this.vm.setProp(t, "args", e.manage(this.vm.newString(r))), n !== void 0 && this.vm.setProp(t, "uiState", e.manage(this.vm.newString(n))), o !== void 0 && this.vm.setProp(t, "activeArgs", e.manage(this.vm.newString(o))), this.vm.setProp(t, "callbackRegistry", this.callbackRegistry), this.vm.setProp(
         t,
         "featureFlags",
         this.exportObjectUniversal(bs.GlobalCfgRenderCtxFeatureFlags, e)
       );
-      const n = (i, c) => {
-        this.vm.newFunction(i, c).consume((a) => this.vm.setProp(t, i, a));
+      const i = (a, c) => {
+        this.vm.newFunction(a, c).consume((l) => this.vm.setProp(t, a, l));
       };
-      n("getAccessorHandleByName", (i) => this.exportSingleValue(
-        this.getAccessorHandleByName(this.vm.getString(i)),
+      i("getAccessorHandleByName", (a) => this.exportSingleValue(
+        this.getAccessorHandleByName(this.vm.getString(a)),
         void 0
-      )), n("resolveWithCommon", (i, c, ...a) => this.exportSingleValue(
+      )), i("resolveWithCommon", (a, c, ...l) => this.exportSingleValue(
         this.resolveWithCommon(
-          this.vm.getString(i),
+          this.vm.getString(a),
           this.importObjectViaJson(c),
-          ...a.map(
-            (l) => this.importObjectViaJson(l)
+          ...l.map(
+            (u) => this.importObjectViaJson(u)
           )
         ),
         void 0
-      )), n("getResourceType", (i) => this.exportObjectViaJson(this.getResourceType(this.vm.getString(i)), void 0)), n("getInputsLocked", (i) => this.exportSingleValue(this.getInputsLocked(this.vm.getString(i)), void 0)), n("getOutputsLocked", (i) => this.exportSingleValue(this.getOutputsLocked(this.vm.getString(i)), void 0)), n("getIsReadyOrError", (i) => this.exportSingleValue(this.getIsReadyOrError(this.vm.getString(i)), void 0)), n("getIsFinal", (i) => this.exportSingleValue(this.getIsFinal(this.vm.getString(i)), void 0)), n("getError", (i) => this.exportSingleValue(this.getError(this.vm.getString(i)), void 0)), n("listInputFields", (i) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(i)), void 0)), n("listOutputFields", (i) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(i)), void 0)), n("listDynamicFields", (i) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(i)), void 0)), n("getKeyValueBase64", (i, c) => this.exportSingleValue(
-        this.getKeyValueBase64(this.vm.getString(i), this.vm.getString(c)),
-        void 0
-      )), n("getKeyValueAsString", (i, c) => this.exportSingleValue(
-        this.getKeyValueAsString(this.vm.getString(i), this.vm.getString(c)),
+      )), i("getResourceType", (a) => this.exportObjectViaJson(this.getResourceType(this.vm.getString(a)), void 0)), i("getInputsLocked", (a) => this.exportSingleValue(this.getInputsLocked(this.vm.getString(a)), void 0)), i("getOutputsLocked", (a) => this.exportSingleValue(this.getOutputsLocked(this.vm.getString(a)), void 0)), i("getIsReadyOrError", (a) => this.exportSingleValue(this.getIsReadyOrError(this.vm.getString(a)), void 0)), i("getIsFinal", (a) => this.exportSingleValue(this.getIsFinal(this.vm.getString(a)), void 0)), i("getError", (a) => this.exportSingleValue(this.getError(this.vm.getString(a)), void 0)), i("listInputFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("listOutputFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("listDynamicFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("getKeyValueBase64", (a, c) => this.exportSingleValue(
+        this.getKeyValueBase64(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), n("getDataBase64", (i) => this.exportSingleValue(this.getDataBase64(this.vm.getString(i)), void 0)), n("getDataAsString", (i) => this.exportSingleValue(this.getDataAsString(this.vm.getString(i)), void 0)), n("parsePObjectCollection", (i, c, a, ...l) => this.exportObjectUniversal(
-        this.parsePObjectCollection(
-          this.vm.getString(i),
-          this.vm.dump(c),
-          this.vm.getString(a),
-          ...l.map(this.vm.getString)
-        ),
+      )), i("getKeyValueAsString", (a, c) => this.exportSingleValue(
+        this.getKeyValueAsString(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), n("getBlobContentAsBase64", (i) => this.exportSingleValue(
-        this.getBlobContentAsBase64(this.vm.getString(i)),
+      )), i("getDataBase64", (a) => this.exportSingleValue(this.getDataBase64(this.vm.getString(a)), void 0)), i("getDataAsString", (a) => this.exportSingleValue(this.getDataAsString(this.vm.getString(a)), void 0)), i(
+        "parsePObjectCollection",
+        (a, c, l, ...u) => this.exportObjectUniversal(
+          this.parsePObjectCollection(
+            this.vm.getString(a),
+            this.vm.dump(c),
+            this.vm.getString(l),
+            ...u.map(this.vm.getString)
+          ),
+          void 0
+        )
+      ), i("getBlobContentAsBase64", (a) => this.exportSingleValue(
+        this.getBlobContentAsBase64(this.vm.getString(a)),
         void 0
-      )), n("getBlobContentAsString", (i) => this.exportSingleValue(
-        this.getBlobContentAsString(this.vm.getString(i)),
+      )), i("getBlobContentAsString", (a) => this.exportSingleValue(
+        this.getBlobContentAsString(this.vm.getString(a)),
         void 0
-      )), n("getDownloadedBlobContentHandle", (i) => this.exportSingleValue(
-        this.getDownloadedBlobContentHandle(this.vm.getString(i)),
+      )), i("getDownloadedBlobContentHandle", (a) => this.exportSingleValue(
+        this.getDownloadedBlobContentHandle(this.vm.getString(a)),
         void 0
-      )), n("getOnDemandBlobContentHandle", (i) => this.exportSingleValue(
-        this.getOnDemandBlobContentHandle(this.vm.getString(i)),
+      )), i("getOnDemandBlobContentHandle", (a) => this.exportSingleValue(
+        this.getOnDemandBlobContentHandle(this.vm.getString(a)),
         void 0
-      )), n("getImportProgress", (i) => this.exportSingleValue(this.getImportProgress(this.vm.getString(i)), void 0)), n("getLastLogs", (i, c) => this.exportSingleValue(
-        this.getLastLogs(this.vm.getString(i), this.vm.getNumber(c)),
+      )), i("getImportProgress", (a) => this.exportSingleValue(this.getImportProgress(this.vm.getString(a)), void 0)), i("getLastLogs", (a, c) => this.exportSingleValue(
+        this.getLastLogs(this.vm.getString(a), this.vm.getNumber(c)),
         void 0
-      )), n("getProgressLog", (i, c) => this.exportSingleValue(
-        this.getProgressLog(this.vm.getString(i), this.vm.getString(c)),
+      )), i("getProgressLog", (a, c) => this.exportSingleValue(
+        this.getProgressLog(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), n("getLogHandle", (i) => this.exportSingleValue(this.getLogHandle(this.vm.getString(i)), void 0)), n("getBlockLabel", (i) => this.exportSingleValue(this.getBlockLabel(this.vm.getString(i)), void 0)), n("getDataFromResultPool", (i) => this.exportObjectUniversal(this.getDataFromResultPool(), void 0)), n("getDataWithErrorsFromResultPool", (i) => this.exportObjectUniversal(this.getDataWithErrorsFromResultPool(), void 0)), n("getSpecsFromResultPool", (i) => this.exportObjectUniversal(this.getSpecsFromResultPool(), void 0)), n("calculateOptions", (i) => this.exportObjectUniversal(
-        this.calculateOptions(this.importObjectViaJson(i)),
+      )), i("getLogHandle", (a) => this.exportSingleValue(this.getLogHandle(this.vm.getString(a)), void 0)), i("getBlockLabel", (a) => this.exportSingleValue(this.getBlockLabel(this.vm.getString(a)), void 0)), i("getDataFromResultPool", (a) => this.exportObjectUniversal(this.getDataFromResultPool(), void 0)), i("getDataWithErrorsFromResultPool", (a) => this.exportObjectUniversal(this.getDataWithErrorsFromResultPool(), void 0)), i("getSpecsFromResultPool", (a) => this.exportObjectUniversal(this.getSpecsFromResultPool(), void 0)), i("calculateOptions", (a) => this.exportObjectUniversal(
+        this.calculateOptions(this.importObjectViaJson(a)),
         void 0
-      )), n("getSpecFromResultPoolByRef", (i, c) => this.exportObjectUniversal(
+      )), i("getSpecFromResultPoolByRef", (a, c) => this.exportObjectUniversal(
         this.getSpecFromResultPoolByRef(
-          this.vm.getString(i),
+          this.vm.getString(a),
           this.vm.getString(c)
         ),
         void 0
-      )), n("getDataFromResultPoolByRef", (i, c) => this.exportObjectUniversal(
+      )), i("getDataFromResultPoolByRef", (a, c) => this.exportObjectUniversal(
         this.getDataFromResultPoolByRef(
-          this.vm.getString(i),
+          this.vm.getString(a),
           this.vm.getString(c)
         ),
         void 0
-      )), n("createPFrame", (i) => this.exportSingleValue(
-        this.createPFrame(
-          this.importObjectViaJson(i)
-        ),
+      )), i("createPFrame", (a) => this.exportSingleValue(
+        this.createPFrame(this.importObjectViaJson(a)),
         void 0
-      )), n("createPTable", (i) => this.exportSingleValue(
+      )), i("createPTable", (a) => this.exportSingleValue(
         this.createPTable(
-          this.importObjectViaJson(i)
+          this.importObjectViaJson(a)
         ),
         void 0
-      )), n("getCurrentUnstableMarker", () => this.exportSingleValue(this.getCurrentUnstableMarker(), void 0)), this.vm.setProp(this.vm.global, "cfgRenderCtx", t);
+      )), i("getCurrentUnstableMarker", () => this.exportSingleValue(this.getCurrentUnstableMarker(), void 0)), this.vm.setProp(this.vm.global, "cfgRenderCtx", t);
     });
   }
 }
@@ -2841,7 +2846,7 @@ function Ye(s, e) {
   return Oe(
     s.traverse(
       {
-        field: U(e, "blockPack"),
+        field: V(e, "blockPack"),
         assertFieldType: "Dynamic",
         errorIfFieldNotSet: !0
       },
@@ -2856,12 +2861,12 @@ function Ye(s, e) {
 const Ue = process.env.MI_LOG_OUTPUT_STATUS;
 function Yn(s, e, t, r, o, n = {}) {
   const i = `${e.blockId}#lambda#${o}#${t.handle}`;
-  return n = { ...n, key: i }, n.mode === void 0 && t.retentive === !0 && (n.mode = "StableOnlyRetentive"), V.makeRaw((c) => {
-    const a = new mt();
-    c.addOnDestroy(() => a.dispose());
-    const l = a.manage(s.quickJs.newRuntime());
+  return n = { ...n, key: i }, n.mode === void 0 && t.retentive === !0 && (n.mode = "StableOnlyRetentive"), U.makeRaw((a) => {
+    const c = new mt();
+    a.addOnDestroy(() => c.dispose());
+    const l = c.manage(s.quickJs.newRuntime());
     l.setMemoryLimit(1024 * 640), l.setMaxStackSize(1024 * 320);
-    const u = a.manage(l.newContext()), d = new Xe(a, u, e, s, c);
+    const u = c.manage(l.newContext()), d = new Xe(c, u, e, s, a);
     d.evaluateBundle(r.content);
     const f = d.runCallback(t.handle);
     d.resetComputableCtx();
@@ -2888,31 +2893,31 @@ function $e(s, e, t, r, o, n = {}) {
   } else return Xn(s.driverKit, e, t, n);
 }
 function Zn(s, e, t) {
-  return V.make(
+  return U.make(
     (r) => {
       var g, E, F, N, _, P, se, pe;
-      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(It)), i = B(o.getKeyValueAsJson(Te)), c = B(o.getKeyValueAsJson(Ae)), a = B(o.getKeyValueAsJson(de)), l = B(
+      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(It)), i = B(o.getKeyValueAsJson(Te)), a = B(o.getKeyValueAsJson(Ae)), c = B(o.getKeyValueAsJson(de)), l = B(
         o.getKeyValueAsJson(We)
       ), u = /* @__PURE__ */ new Map();
-      for (const { id: A } of te(a)) {
+      for (const { id: A } of te(c)) {
         const q = o.traverse({
-          field: U(A, "currentArgs"),
+          field: V(A, "currentArgs"),
           assertFieldType: "Dynamic",
           errorIfFieldNotSet: !0
         });
         let oe;
         const K = o.traverse({
-          field: U(A, "prodArgs"),
+          field: V(A, "prodArgs"),
           assertFieldType: "Dynamic",
           stableIfNotFound: !0
         });
         if (K !== void 0) {
           const J = o.getField({
-            field: U(A, "prodOutput"),
+            field: V(A, "prodOutput"),
             assertFieldType: "Dynamic",
             errorIfFieldNotFound: !0
           }), x = o.getField({
-            field: U(A, "prodUiCtx"),
+            field: V(A, "prodUiCtx"),
             assertFieldType: "Dynamic",
             errorIfFieldNotFound: !0
           });
@@ -2927,7 +2932,7 @@ function Zn(s, e, t) {
         }
         u.set(A, { currentArguments: q.getDataAsJson(), prod: oe });
       }
-      const d = Ke(a, (A) => u.get(A).currentArguments), f = new Set(l.blocksInLimbo), h = [...te(a)].map(({ id: A, label: q, renderingMode: oe }) => {
+      const d = Ke(c, (A) => u.get(A).currentArguments), f = new Set(l.blocksInLimbo), h = [...te(c)].map(({ id: A, label: q, renderingMode: oe }) => {
         var w, C, O, R, T;
         const K = B(u.get(A)), J = B(d.nodes.get(A));
         let x = "NotCalculated";
@@ -2962,7 +2967,7 @@ function Zn(s, e, t) {
             sdkVersion: I.sdkVersion
           };
         }) || {}, m = o.traverse({
-          field: U(A, "blockSettings"),
+          field: V(A, "blockSettings"),
           assertFieldType: "Dynamic",
           errorIfFieldNotSet: !0
         }).getDataAsJson(), b = Oe(
@@ -2993,7 +2998,7 @@ function Zn(s, e, t) {
         };
       });
       return {
-        meta: c,
+        meta: a,
         created: new Date(n),
         lastModified: new Date(i),
         authorMarker: o.getKeyValueAsJson(wt),
@@ -3008,10 +3013,10 @@ function Zn(s, e, t) {
           blocks: r.blocks.map((i) => {
             var u, d;
             i.inputsValid || o.add(i.id), i.stale && n.add(i.id);
-            const c = i.stale || i.upstreams.findIndex((f) => n.has(f)) !== -1, a = (c || i.outputErrors) && !!i.inputsValid && !i.missingReference && i.upstreams.findIndex((f) => o.has(f)) === -1, l = {
+            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, l = {
               ...i,
-              canRun: a,
-              stale: c,
+              canRun: c,
+              stale: a,
               updateSuggestions: ((u = i.updates) == null ? void 0 : u.suggestions) ?? [],
               updatedBlockPack: (d = i.updates) == null ? void 0 : d.mainSuggestion
             };
@@ -3041,7 +3046,7 @@ function ei(s, e) {
 }
 function ti(s, e) {
   if (s !== void 0)
-    return V.make(
+    return U.make(
       (t) => ei(t.accessor(s), e),
       {
         postprocessValue: (t) => {
@@ -3055,17 +3060,17 @@ function ti(s, e) {
     ).withStableType();
 }
 function ri(s, e, t) {
-  return V.make(
+  return U.make(
     (r) => {
-      var c;
-      const o = r.accessor(s).node(), n = Ye(o, e), i = (c = o.traverse(
+      var a;
+      const o = r.accessor(s).node(), n = Ye(o, e), i = (a = o.traverse(
         {
-          field: U(e, "blockPack"),
+          field: V(e, "blockPack"),
           assertFieldType: "Dynamic"
         },
         { field: L.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 },
         { field: zr, assertFieldType: "Input" }
-      )) == null ? void 0 : c.persist();
+      )) == null ? void 0 : a.persist();
       return {
         path: ti(i, t),
         sdkVersion: n == null ? void 0 : n.cfg.sdkVersion
@@ -3076,7 +3081,7 @@ function ri(s, e, t) {
 }
 function is(s, e, t) {
   if (t === void 0)
-    return V.make((i) => is(s, e, i), {
+    return U.make((i) => is(s, e, i), {
       key: `inputs#${Br(s.rid)}#${e}`
     });
   const r = t.accessor(s).node(), o = At(s, e), n = o.uiState(t);
@@ -3087,33 +3092,33 @@ function is(s, e, t) {
   };
 }
 function si(s, e, t) {
-  return V.make(
+  return U.make(
     (r) => {
       const o = r.accessor(s).node(), n = es(s, e);
-      return Oe(Ye(o, e), ({ cfg: i, bpId: c }) => {
-        const a = {};
+      return Oe(Ye(o, e), ({ cfg: i, bpId: a }) => {
+        const c = {};
         for (const [l, u] of Object.entries(i.outputs)) {
-          const d = $e(t, n, u, i.code, c);
-          a[l] = V.wrapError(d);
+          const d = $e(t, n, u, i.code, a);
+          c[l] = U.wrapError(d);
         }
-        return a;
+        return c;
       });
     },
     { key: "outputs#" + Br(s.rid) + "#" + e }
   ).withStableType();
 }
 function oi(s, e) {
-  return V.make((t) => {
+  return U.make((t) => {
     const r = t.accessor(s).node(), o = B(r.getKeyValueAsJson(de)), n = [];
-    for (const { id: i, renderingMode: c } of te(o)) {
-      const a = Ye(r, i);
-      if (a === void 0) continue;
-      const l = Object.entries(a.cfg.outputs).map(([, d]) => d).filter((d) => Qn(d)).map((d) => d);
+    for (const { id: i, renderingMode: a } of te(o)) {
+      const c = Ye(r, i);
+      if (c === void 0) continue;
+      const l = Object.entries(c.cfg.outputs).map(([, d]) => d).filter((d) => Qn(d)).map((d) => d);
       if (l.length === 0) continue;
       const u = es(r.persist(), i);
       for (const d of l)
         n.push(
-          V.wrapError($e(e, u, d, a.cfg.code, a.bpId))
+          U.wrapError($e(e, u, d, c.cfg.code, c.bpId))
         );
     }
     return n;
@@ -3136,7 +3141,7 @@ class ni {
     return r === void 0 && (r = { state: { ...Cs }, change: new Ht() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
   }
   getState(e) {
-    return V.make(
+    return U.make(
       (t) => this.readState(t, e),
       { key: `navigationState#${e}` }
     );
@@ -3193,7 +3198,7 @@ class Lt {
    * @return returns newly created block id
    * */
   async addBlock(e, t, r, o = void 0, n = Fe()) {
-    const i = await this.env.bpPreparer.prepare(t), c = await this.env.bpPreparer.getBlockConfigContainer(t), a = Ar(c);
+    const i = await this.env.bpPreparer.prepare(t), a = await this.env.bpPreparer.getBlockConfigContainer(t), c = Ar(a);
     return await Y(
       this.env.pl,
       this.rid,
@@ -3202,11 +3207,11 @@ class Lt {
         {
           id: n,
           label: e,
-          renderingMode: a.renderingMode
+          renderingMode: c.renderingMode
         },
         {
-          args: JSON.stringify(a.initialArgs),
-          uiState: JSON.stringify(a.initialUiState),
+          args: JSON.stringify(c.initialArgs),
+          uiState: JSON.stringify(c.initialUiState),
           blockPack: i
         },
         r
@@ -3223,7 +3228,7 @@ class Lt {
       this.env.pl,
       this.rid,
       o,
-      (c) => c.migrateBlockPack(
+      (a) => a.migrateBlockPack(
         e,
         n,
         r ? JSON.stringify(i.initialArgs) : void 0
@@ -3254,10 +3259,10 @@ class Lt {
           {
             id: n.id,
             label: n.label,
-            blocks: e.map((c) => {
-              const a = n.blocks.find((l) => l.id === c);
-              if (a === void 0) throw new Error(`Can't find block: ${c}`);
-              return a;
+            blocks: e.map((a) => {
+              const c = n.blocks.find((l) => l.id === a);
+              if (c === void 0) throw new Error(`Can't find block: ${a}`);
+              return c;
             })
           }
         ]
@@ -3343,14 +3348,14 @@ class Lt {
   async resetBlockArgsAndUiState(e, t) {
     await this.env.pl.withWriteTx("BlockInputsReset", async (r) => {
       const o = gt(
-        (await r.getField(j(this.rid, U(e, "blockPack")))).value
+        (await r.getField(j(this.rid, V(e, "blockPack")))).value
       ), n = gt(
         (await r.getField(j(o, L.HolderRefField))).value
-      ), i = await r.getResourceData(n, !1), c = JSON.parse(
+      ), i = await r.getResourceData(n, !1), a = JSON.parse(
         Buffer.from(B(i.data)).toString("utf-8")
       );
-      await Y(r, this.rid, t, (a) => {
-        a.setArgs([{ blockId: e, args: JSON.stringify(c.config.initialArgs) }]), a.setUiState(e, void 0);
+      await Y(r, this.rid, t, (c) => {
+        c.setArgs([{ blockId: e, args: JSON.stringify(a.config.initialArgs) }]), c.setUiState(e, void 0);
       }), await r.commit();
     }), await this.projectTree.refreshState();
   }
@@ -3358,7 +3363,7 @@ class Lt {
     const t = this.blockComputables.get(e);
     if (t === void 0) {
       const r = si(this.projectTree.entry(), e, this.env), n = {
-        fullState: V.make(
+        fullState: U.make(
           (i) => ({
             argsAndUiState: is(this.projectTree.entry(), e, i),
             outputs: r,
@@ -3511,7 +3516,7 @@ var Ze = gi;
     MAX_LENGTH: o
   } = Qe, n = Ze;
   e = s.exports = {};
-  const i = e.re = [], c = e.safeRe = [], a = e.src = [], l = e.t = {};
+  const i = e.re = [], a = e.safeRe = [], c = e.src = [], l = e.t = {};
   let u = 0;
   const d = "[a-zA-Z0-9-]", f = [
     ["\\s", 1],
@@ -3523,9 +3528,9 @@ var Ze = gi;
     return E;
   }, g = (E, F, N) => {
     const _ = h(F), P = u++;
-    n(E, P, F), l[E] = P, a[P] = F, i[P] = new RegExp(F, N ? "g" : void 0), c[P] = new RegExp(_, N ? "g" : void 0);
+    n(E, P, F), l[E] = P, c[P] = F, i[P] = new RegExp(F, N ? "g" : void 0), a[P] = new RegExp(_, N ? "g" : void 0);
   };
-  g("NUMERICIDENTIFIER", "0|[1-9]\\d*"), g("NUMERICIDENTIFIERLOOSE", "\\d+"), g("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${d}*`), g("MAINVERSION", `(${a[l.NUMERICIDENTIFIER]})\\.(${a[l.NUMERICIDENTIFIER]})\\.(${a[l.NUMERICIDENTIFIER]})`), g("MAINVERSIONLOOSE", `(${a[l.NUMERICIDENTIFIERLOOSE]})\\.(${a[l.NUMERICIDENTIFIERLOOSE]})\\.(${a[l.NUMERICIDENTIFIERLOOSE]})`), g("PRERELEASEIDENTIFIER", `(?:${a[l.NUMERICIDENTIFIER]}|${a[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASEIDENTIFIERLOOSE", `(?:${a[l.NUMERICIDENTIFIERLOOSE]}|${a[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASE", `(?:-(${a[l.PRERELEASEIDENTIFIER]}(?:\\.${a[l.PRERELEASEIDENTIFIER]})*))`), g("PRERELEASELOOSE", `(?:-?(${a[l.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${a[l.PRERELEASEIDENTIFIERLOOSE]})*))`), g("BUILDIDENTIFIER", `${d}+`), g("BUILD", `(?:\\+(${a[l.BUILDIDENTIFIER]}(?:\\.${a[l.BUILDIDENTIFIER]})*))`), g("FULLPLAIN", `v?${a[l.MAINVERSION]}${a[l.PRERELEASE]}?${a[l.BUILD]}?`), g("FULL", `^${a[l.FULLPLAIN]}$`), g("LOOSEPLAIN", `[v=\\s]*${a[l.MAINVERSIONLOOSE]}${a[l.PRERELEASELOOSE]}?${a[l.BUILD]}?`), g("LOOSE", `^${a[l.LOOSEPLAIN]}$`), g("GTLT", "((?:<|>)?=?)"), g("XRANGEIDENTIFIERLOOSE", `${a[l.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`), g("XRANGEIDENTIFIER", `${a[l.NUMERICIDENTIFIER]}|x|X|\\*`), g("XRANGEPLAIN", `[v=\\s]*(${a[l.XRANGEIDENTIFIER]})(?:\\.(${a[l.XRANGEIDENTIFIER]})(?:\\.(${a[l.XRANGEIDENTIFIER]})(?:${a[l.PRERELEASE]})?${a[l.BUILD]}?)?)?`), g("XRANGEPLAINLOOSE", `[v=\\s]*(${a[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${a[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${a[l.XRANGEIDENTIFIERLOOSE]})(?:${a[l.PRERELEASELOOSE]})?${a[l.BUILD]}?)?)?`), g("XRANGE", `^${a[l.GTLT]}\\s*${a[l.XRANGEPLAIN]}$`), g("XRANGELOOSE", `^${a[l.GTLT]}\\s*${a[l.XRANGEPLAINLOOSE]}$`), g("COERCEPLAIN", `(^|[^\\d])(\\d{1,${t}})(?:\\.(\\d{1,${t}}))?(?:\\.(\\d{1,${t}}))?`), g("COERCE", `${a[l.COERCEPLAIN]}(?:$|[^\\d])`), g("COERCEFULL", a[l.COERCEPLAIN] + `(?:${a[l.PRERELEASE]})?(?:${a[l.BUILD]})?(?:$|[^\\d])`), g("COERCERTL", a[l.COERCE], !0), g("COERCERTLFULL", a[l.COERCEFULL], !0), g("LONETILDE", "(?:~>?)"), g("TILDETRIM", `(\\s*)${a[l.LONETILDE]}\\s+`, !0), e.tildeTrimReplace = "$1~", g("TILDE", `^${a[l.LONETILDE]}${a[l.XRANGEPLAIN]}$`), g("TILDELOOSE", `^${a[l.LONETILDE]}${a[l.XRANGEPLAINLOOSE]}$`), g("LONECARET", "(?:\\^)"), g("CARETTRIM", `(\\s*)${a[l.LONECARET]}\\s+`, !0), e.caretTrimReplace = "$1^", g("CARET", `^${a[l.LONECARET]}${a[l.XRANGEPLAIN]}$`), g("CARETLOOSE", `^${a[l.LONECARET]}${a[l.XRANGEPLAINLOOSE]}$`), g("COMPARATORLOOSE", `^${a[l.GTLT]}\\s*(${a[l.LOOSEPLAIN]})$|^$`), g("COMPARATOR", `^${a[l.GTLT]}\\s*(${a[l.FULLPLAIN]})$|^$`), g("COMPARATORTRIM", `(\\s*)${a[l.GTLT]}\\s*(${a[l.LOOSEPLAIN]}|${a[l.XRANGEPLAIN]})`, !0), e.comparatorTrimReplace = "$1$2$3", g("HYPHENRANGE", `^\\s*(${a[l.XRANGEPLAIN]})\\s+-\\s+(${a[l.XRANGEPLAIN]})\\s*$`), g("HYPHENRANGELOOSE", `^\\s*(${a[l.XRANGEPLAINLOOSE]})\\s+-\\s+(${a[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-]${d}*`), 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", `${d}+`), 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*$");
 })(Et, Et.exports);
 var De = Et.exports;
 const mi = Object.freeze({ loose: !0 }), vi = Object.freeze({}), yi = (s) => s ? typeof s != "object" ? mi : s : vi;
@@ -3716,10 +3721,10 @@ const hr = Se, Ti = (s, e) => {
   const t = hr(s, null, !0), r = hr(e, null, !0), o = t.compare(r);
   if (o === 0)
     return null;
-  const n = o > 0, i = n ? t : r, c = n ? r : t, a = !!i.prerelease.length;
-  if (!!c.prerelease.length && !a)
-    return !c.patch && !c.minor ? "major" : i.patch ? "patch" : i.minor ? "minor" : "major";
-  const u = a ? "pre" : "";
+  const n = o > 0, i = n ? t : r, a = n ? r : t, c = !!i.prerelease.length;
+  if (!!a.prerelease.length && !c)
+    return !a.patch && !a.minor ? "major" : i.patch ? "patch" : i.minor ? "minor" : "major";
+  const u = c ? "pre" : "";
   return t.major !== r.major ? u + "major" : t.minor !== r.minor ? u + "minor" : t.patch !== r.patch ? u + "patch" : "prerelease";
 };
 var Ai = Ti;
@@ -3796,16 +3801,16 @@ const Ea = M, ka = Se, { safeRe: Me, t: _e } = De, Pa = (s, e) => {
   if (!e.rtl)
     t = s.match(e.includePrerelease ? Me[_e.COERCEFULL] : Me[_e.COERCE]);
   else {
-    const a = e.includePrerelease ? Me[_e.COERCERTLFULL] : Me[_e.COERCERTL];
+    const c = e.includePrerelease ? Me[_e.COERCERTLFULL] : Me[_e.COERCERTL];
     let l;
-    for (; (l = a.exec(s)) && (!t || t.index + t[0].length !== s.length); )
-      (!t || l.index + l[0].length !== t.index + t[0].length) && (t = l), a.lastIndex = l.index + l[1].length + l[2].length;
-    a.lastIndex = -1;
+    for (; (l = c.exec(s)) && (!t || t.index + t[0].length !== s.length); )
+      (!t || l.index + l[0].length !== t.index + t[0].length) && (t = l), c.lastIndex = l.index + l[1].length + l[2].length;
+    c.lastIndex = -1;
   }
   if (t === null)
     return null;
-  const r = t[2], o = t[3] || "0", n = t[4] || "0", i = e.includePrerelease && t[5] ? `-${t[5]}` : "", c = e.includePrerelease && t[6] ? `+${t[6]}` : "";
-  return ka(`${r}.${o}.${n}${i}${c}`, e);
+  const r = t[2], o = t[3] || "0", n = t[4] || "0", i = e.includePrerelease && t[5] ? `-${t[5]}` : "", a = e.includePrerelease && t[6] ? `+${t[6]}` : "";
+  return ka(`${r}.${o}.${n}${i}${a}`, e);
 };
 var Oa = Pa;
 class $a {
@@ -3880,10 +3885,10 @@ function Z() {
       const m = ((this.options.includePrerelease && h) | (this.options.loose && g)) + ":" + p, b = r.get(m);
       if (b)
         return b;
-      const w = this.options.loose, C = w ? a[l.HYPHENRANGELOOSE] : a[l.HYPHENRANGE];
-      p = p.replace(C, X(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(a[l.COMPARATORTRIM], u), i("comparator trim", p), p = p.replace(a[l.TILDETRIM], d), i("tilde trim", p), p = p.replace(a[l.CARETTRIM], f), i("caret trim", p);
+      const w = this.options.loose, C = w ? c[l.HYPHENRANGELOOSE] : c[l.HYPHENRANGE];
+      p = p.replace(C, X(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[l.COMPARATORTRIM], u), i("comparator trim", p), p = p.replace(c[l.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[l.CARETTRIM], f), i("caret trim", p);
       let O = p.split(" ").map((I) => _(I, this.options)).join(" ").split(/\s+/).map((I) => x(I, this.options));
-      w && (O = O.filter((I) => (i("loose invalid filter", I, this.options), !!I.match(a[l.COMPARATORLOOSE])))), i("range list", O);
+      w && (O = O.filter((I) => (i("loose invalid filter", I, this.options), !!I.match(c[l.COMPARATORLOOSE])))), i("range list", O);
       const R = /* @__PURE__ */ new Map(), T = O.map((I) => new n(I, this.options));
       for (const I of T) {
         if (E(I))
@@ -3905,7 +3910,7 @@ function Z() {
         return !1;
       if (typeof p == "string")
         try {
-          p = new c(p, this.options);
+          p = new a(p, this.options);
         } catch {
           return !1;
         }
@@ -3916,8 +3921,8 @@ function Z() {
     }
   }
   at = e;
-  const t = Ia, r = new t(), o = Nt, n = tt(), i = Ze, c = M, {
-    safeRe: a,
+  const t = Ia, r = new t(), o = Nt, n = tt(), i = Ze, a = M, {
+    safeRe: c,
     t: l,
     comparatorTrimReplace: u,
     tildeTrimReplace: d,
@@ -3930,7 +3935,7 @@ function Z() {
       y = m.every((w) => b.intersects(w, p)), b = m.pop();
     return y;
   }, _ = (v, p) => (i("comp", v, p), v = A(v, p), i("caret", v), v = se(v, p), i("tildes", v), v = oe(v, p), i("xrange", v), v = J(v, p), i("stars", v), v), P = (v) => !v || v.toLowerCase() === "x" || v === "*", se = (v, p) => v.trim().split(/\s+/).map((y) => pe(y, p)).join(" "), pe = (v, p) => {
-    const y = p.loose ? a[l.TILDELOOSE] : a[l.TILDE];
+    const y = p.loose ? c[l.TILDELOOSE] : c[l.TILDE];
     return v.replace(y, (m, b, w, C, O) => {
       i("tilde", v, m, b, w, C, O);
       let R;
@@ -3938,7 +3943,7 @@ function Z() {
     });
   }, A = (v, p) => v.trim().split(/\s+/).map((y) => q(y, p)).join(" "), q = (v, p) => {
     i("caret", v, p);
-    const y = p.loose ? a[l.CARETLOOSE] : a[l.CARET], m = p.includePrerelease ? "-0" : "";
+    const y = p.loose ? c[l.CARETLOOSE] : c[l.CARET], m = p.includePrerelease ? "-0" : "";
     return v.replace(y, (b, w, C, O, R) => {
       i("caret", v, b, w, C, O, R);
       let T;
@@ -3946,13 +3951,13 @@ function Z() {
     });
   }, oe = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((y) => K(y, p)).join(" ")), K = (v, p) => {
     v = v.trim();
-    const y = p.loose ? a[l.XRANGELOOSE] : a[l.XRANGE];
+    const y = p.loose ? c[l.XRANGELOOSE] : c[l.XRANGE];
     return v.replace(y, (m, b, w, C, O, R) => {
       i("xRange", v, m, b, w, C, O, R);
       const T = P(w), D = T || P(C), I = D || P(O), fe = I;
       return b === "=" && fe && (b = ""), R = p.includePrerelease ? "-0" : "", T ? b === ">" || b === "<" ? m = "<0.0.0-0" : m = "*" : b && fe ? (D && (C = 0), O = 0, b === ">" ? (b = ">=", D ? (w = +w + 1, C = 0, O = 0) : (C = +C + 1, O = 0)) : b === "<=" && (b = "<", D ? w = +w + 1 : C = +C + 1), b === "<" && (R = "-0"), m = `${b + w}.${C}.${O}${R}`) : D ? m = `>=${w}.0.0${R} <${+w + 1}.0.0-0` : I && (m = `>=${w}.${C}.0${R} <${w}.${+C + 1}.0-0`), i("xRange return", m), m;
     });
-  }, J = (v, p) => (i("replaceStars", v, p), v.trim().replace(a[l.STAR], "")), x = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(a[p.includePrerelease ? l.GTE0PRE : l.GTE0], "")), X = (v) => (p, y, m, b, w, C, O, R, T, D, I, fe) => (P(m) ? y = "" : P(b) ? y = `>=${m}.0.0${v ? "-0" : ""}` : P(w) ? y = `>=${m}.${b}.0${v ? "-0" : ""}` : C ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, P(T) ? R = "" : P(D) ? R = `<${+T + 1}.0.0-0` : P(I) ? R = `<${T}.${+D + 1}.0-0` : fe ? R = `<=${T}.${D}.${I}-${fe}` : v ? R = `<${T}.${D}.${+I + 1}-0` : R = `<=${R}`, `${y} ${R}`.trim()), he = (v, p, y) => {
+  }, J = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[l.STAR], "")), x = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? l.GTE0PRE : l.GTE0], "")), X = (v) => (p, y, m, b, w, C, O, R, T, D, I, fe) => (P(m) ? y = "" : P(b) ? y = `>=${m}.0.0${v ? "-0" : ""}` : P(w) ? y = `>=${m}.${b}.0${v ? "-0" : ""}` : C ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, P(T) ? R = "" : P(D) ? R = `<${+T + 1}.0.0-0` : P(I) ? R = `<${T}.${+D + 1}.0-0` : fe ? R = `<=${T}.${D}.${I}-${fe}` : v ? R = `<${T}.${D}.${+I + 1}-0` : R = `<=${R}`, `${y} ${R}`.trim()), he = (v, p, y) => {
     for (let m = 0; m < v.length; m++)
       if (!v[m].test(p))
         return !1;
@@ -3990,7 +3995,7 @@ function tt() {
       const d = this.options.loose ? r[o.COMPARATORLOOSE] : r[o.COMPARATOR], f = u.match(d);
       if (!f)
         throw new TypeError(`Invalid comparator: ${u}`);
-      this.operator = f[1] !== void 0 ? f[1] : "", this.operator === "=" && (this.operator = ""), f[2] ? this.semver = new c(f[2], this.options.loose) : this.semver = s;
+      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;
     }
     toString() {
       return this.value;
@@ -4000,7 +4005,7 @@ function tt() {
         return !0;
       if (typeof u == "string")
         try {
-          u = new c(u, this.options);
+          u = new a(u, this.options);
         } catch {
           return !1;
         }
@@ -4009,11 +4014,11 @@ function tt() {
     intersects(u, d) {
       if (!(u instanceof e))
         throw new TypeError("a Comparator is required");
-      return this.operator === "" ? this.value === "" ? !0 : new a(u.value, d).test(this.value) : u.operator === "" ? u.value === "" ? !0 : new a(this.value, d).test(u.semver) : (d = t(d), d.includePrerelease && (this.value === "<0.0.0-0" || u.value === "<0.0.0-0") || !d.includePrerelease && (this.value.startsWith("<0.0.0") || u.value.startsWith("<0.0.0")) ? !1 : !!(this.operator.startsWith(">") && u.operator.startsWith(">") || this.operator.startsWith("<") && u.operator.startsWith("<") || this.semver.version === u.semver.version && this.operator.includes("=") && u.operator.includes("=") || n(this.semver, "<", u.semver, d) && this.operator.startsWith(">") && u.operator.startsWith("<") || n(this.semver, ">", u.semver, d) && this.operator.startsWith("<") && u.operator.startsWith(">")));
+      return this.operator === "" ? this.value === "" ? !0 : new c(u.value, d).test(this.value) : u.operator === "" ? u.value === "" ? !0 : new c(this.value, d).test(u.semver) : (d = t(d), d.includePrerelease && (this.value === "<0.0.0-0" || u.value === "<0.0.0-0") || !d.includePrerelease && (this.value.startsWith("<0.0.0") || u.value.startsWith("<0.0.0")) ? !1 : !!(this.operator.startsWith(">") && u.operator.startsWith(">") || this.operator.startsWith("<") && u.operator.startsWith("<") || this.semver.version === u.semver.version && this.operator.includes("=") && u.operator.includes("=") || n(this.semver, "<", u.semver, d) && this.operator.startsWith(">") && u.operator.startsWith("<") || n(this.semver, ">", u.semver, d) && this.operator.startsWith("<") && u.operator.startsWith(">")));
     }
   }
   ct = e;
-  const t = Nt, { safeRe: r, t: o } = De, n = fs, i = Ze, c = M, a = Z();
+  const t = Nt, { safeRe: r, t: o } = De, n = fs, i = Ze, a = M, c = Z();
   return ct;
 }
 const Fa = Z(), Ta = (s, e, t) => {
@@ -4061,13 +4066,13 @@ const lt = M, Ma = Z(), yr = et, _a = (s, e) => {
     const o = s.set[r];
     let n = null;
     o.forEach((i) => {
-      const c = new lt(i.semver.version);
+      const a = new lt(i.semver.version);
       switch (i.operator) {
         case ">":
-          c.prerelease.length === 0 ? c.patch++ : c.prerelease.push(0), c.raw = c.format();
+          a.prerelease.length === 0 ? a.patch++ : a.prerelease.push(0), a.raw = a.format();
         case "":
         case ">=":
-          (!n || yr(c, n)) && (n = c);
+          (!n || yr(a, n)) && (n = a);
           break;
         case "<":
         case "<=":
@@ -4090,13 +4095,13 @@ const Ha = Z(), Wa = (s, e) => {
 var qa = Wa;
 const Xa = M, gs = tt(), { ANY: za } = gs, Ya = Z(), Qa = rt, wr = et, Sr = Bt, Za = xt, ec = jt, tc = (s, e, t, r) => {
   s = new Xa(s, r), e = new Ya(e, r);
-  let o, n, i, c, a;
+  let o, n, i, a, c;
   switch (t) {
     case ">":
-      o = wr, n = Za, i = Sr, c = ">", a = ">=";
+      o = wr, n = Za, i = Sr, a = ">", c = ">=";
       break;
     case "<":
-      o = Sr, n = ec, i = wr, c = "<", a = "<=";
+      o = Sr, n = ec, i = wr, a = "<", c = "<=";
       break;
     default:
       throw new TypeError('Must provide a hilo val of "<" or ">"');
@@ -4108,9 +4113,9 @@ const Xa = M, gs = tt(), { ANY: za } = gs, Ya = Z(), Qa = rt, wr = et, Sr = Bt,
     let d = null, f = null;
     if (u.forEach((h) => {
       h.semver === za && (h = new gs(">=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 === c || d.operator === a || (!f.operator || f.operator === c) && n(s, f.semver))
+    }), d.operator === a || d.operator === c || (!f.operator || f.operator === a) && n(s, f.semver))
       return !1;
-    if (f.operator === a && i(s, f.semver))
+    if (f.operator === c && i(s, f.semver))
       return !1;
   }
   return !0;
@@ -4130,11 +4135,11 @@ var pc = (s, e, t) => {
   for (const u of i)
     uc(u, e, t) ? (n = u, o || (o = u)) : (n && r.push([o, n]), n = null, o = null);
   o && r.push([o, null]);
-  const c = [];
+  const a = [];
   for (const [u, d] of r)
-    u === d ? c.push(u) : !d && u === i[0] ? c.push("*") : d ? u === i[0] ? c.push(`<=${d}`) : c.push(`${u} - ${d}`) : c.push(`>=${u}`);
-  const a = c.join(" || "), l = typeof e.raw == "string" ? e.raw : String(e);
-  return a.length < l.length ? a : e;
+    u === d ? a.push(u) : !d && u === i[0] ? a.push("*") : d ? u === i[0] ? a.push(`<=${d}`) : a.push(`${u} - ${d}`) : a.push(`>=${u}`);
+  const c = a.join(" || "), l = typeof e.raw == "string" ? e.raw : String(e);
+  return c.length < l.length ? c : e;
 };
 const Cr = Z(), Ut = tt(), { ANY: ut } = Ut, Ce = rt, Jt = Q, hc = (s, e, t = {}) => {
   if (s === e)
@@ -4185,19 +4190,19 @@ const Cr = Z(), Ut = tt(), { ANY: ut } = Ut, Ce = rt, Jt = Q, hc = (s, e, t = {}
         return !1;
     return !0;
   }
-  let c, a, l, u, 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, l, u, d = n && !t.includePrerelease && n.semver.prerelease.length ? n.semver : !1, f = 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 (u = u || h.operator === ">" || h.operator === ">=", l = l || 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 (c = Er(o, h, t), c === h && c !== o)
+        if (a = Er(o, h, t), a === h && a !== o)
           return !1;
       } else if (o.operator === ">=" && !Ce(o.semver, String(h), 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 (a = kr(n, h, t), a === h && a !== n)
+        if (c = kr(n, h, t), c === h && c !== n)
           return !1;
       } else if (n.operator === "<=" && !Ce(n.semver, String(h), t))
         return !1;
@@ -4304,29 +4309,29 @@ class nl extends Ms {
           try {
             const i = await ft(n.folder, this.logger);
             if (i === void 0) return { suggestions: [] };
-            const c = await $t(i);
-            return c === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: c }, suggestions: [] };
+            const a = await $t(i);
+            return a === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: a }, suggestions: [] };
           } catch (i) {
             return this.logger.warn(i), { suggestions: [] };
           }
         case "from-registry-v2":
           try {
-            const { versionLock: i, skipVersion: c } = t.settings;
+            const { versionLock: i, skipVersion: a } = t.settings;
             if (i === "patch") return { suggestions: [] };
-            const a = this.registryProvider.getRegistry(n.registryUrl);
+            const c = this.registryProvider.getRegistry(n.registryUrl);
             let l, u = this.preferredUpdateChannel;
             if (u === void 0)
               if (n.channel === void 0)
-                if (await a.getLatestOverview(n.id, ie)) u = ie;
+                if (await c.getLatestOverview(n.id, ie)) u = ie;
                 else {
-                  if (await a.getLatestOverview(n.id, we) === void 0)
+                  if (await c.getLatestOverview(n.id, we) === void 0)
                     return this.logger.error(
                       `No "any" channel record for ${Es(n.id)}`
                     ), { suggestions: [] };
                   u = we;
                 }
               else u = n.channel;
-            const d = await a.getUpdateSuggestions(n.id, u);
+            const d = await c.getUpdateSuggestions(n.id, u);
             if (d === void 0 || d.length === 0) return { suggestions: [] };
             d.reverse();
             let f;
@@ -4346,7 +4351,7 @@ class nl extends Ms {
               update: { ...n, id: { ...n.id, version: F } }
             }));
             if (f === void 0) return { suggestions: h };
-            if (c !== void 0 && rl.lte(f, c))
+            if (a !== void 0 && rl.lte(f, a))
               return { suggestions: h };
             const g = {
               ...n,
@@ -4354,7 +4359,7 @@ class nl extends Ms {
             };
             return (async () => {
               try {
-                await a.getComponents(g.id);
+                await c.getComponents(g.id);
               } catch (E) {
                 this.logger.warn(E);
               }
@@ -4470,13 +4475,13 @@ class al {
       }
     ), this.pFrame.setDataSource(this);
     for (const n of o) {
-      for (const c of nn(n.data)) this.blobIdToResource.set(Ir(c), c);
+      for (const a of nn(n.data)) this.blobIdToResource.set(Ir(a), a);
       const i = an(n.data, Ir);
       try {
         this.pFrame.addColumnSpec(n.id, n.spec), this.pFrame.setColumnData(n.id, i);
-      } catch (c) {
+      } catch (a) {
         throw new Error(
-          `Adding column ${n.id} to PFrame failed: ${c}; Spec: ${JSON.stringify(n.spec)}, DataInfo: ${JSON.stringify(i)}.`
+          `Adding column ${n.id} to PFrame failed: ${a}; Spec: ${JSON.stringify(n.spec)}, DataInfo: ${JSON.stringify(i)}.`
         );
       }
     }
@@ -4524,13 +4529,13 @@ class cl {
         super(), this.pFrames = n;
       }
       async createNewResource(n) {
-        const i = this.pFrames.getByKey(n.pFrameHandle), c = await o.run(async () => (ye().logPFrameRequests && t.info(
+        const i = this.pFrames.getByKey(n.pFrameHandle), a = await o.run(async () => (ye().logPFrameRequests && t.info(
           `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
         ), await i.pFrame.createTable({
           src: Ie(n.def.src),
           filters: pt(n.def.filters)
         })));
-        return n.def.sorting.length !== 0 ? c.sort(n.def.sorting) : c;
+        return n.def.sorting.length !== 0 ? a.sort(n.def.sorting) : a;
       }
       calculateParamsKey(n) {
         return ll(n);
@@ -4571,7 +4576,7 @@ class cl {
         async () => await this.pFrames.getByKey(e).pFrame.findColumns(r)
       )).hits.filter((n) => (
         // only exactly matching columns
-        n.mappingVariants.length === 0 || n.mappingVariants.some((i) => i.qualifications.forHit.length === 0 && i.qualifications.forQueries.every((c) => c.length === 0))
+        n.mappingVariants.length === 0 || n.mappingVariants.some((i) => i.qualifications.forHit.length === 0 && i.qualifications.forQueries.every((a) => a.length === 0))
       )).map((n) => n.hit)
     };
   }
@@ -4601,9 +4606,9 @@ class cl {
     const o = r.getSpec(), n = await this.concurrencyLimiter.run(
       async () => await r.getData([...o.keys()])
     );
-    return r.dispose(), o.map((i, c) => ({
+    return r.dispose(), o.map((i, a) => ({
       spec: i,
-      data: n[c]
+      data: n[a]
     }));
   }
   async getUniqueValues(e, t) {
@@ -4668,9 +4673,9 @@ function ul(s) {
           n = {
             type: o.type,
             keyLength: o.keyLength,
-            payload: Object.entries(o.data).map(([c, a]) => ({
-              key: c,
-              value: a
+            payload: Object.entries(o.data).map(([a, c]) => ({
+              key: a,
+              value: c
             }))
           };
           break;
@@ -4678,9 +4683,9 @@ function ul(s) {
           n = {
             type: o.type,
             keyLength: o.partitionKeyLength,
-            payload: Object.entries(o.parts).map(([c, a]) => ({
-              key: c,
-              value: a.id.toString()
+            payload: Object.entries(o.parts).map(([a, c]) => ({
+              key: a,
+              value: c.id.toString()
             }))
           };
           break;
@@ -4688,16 +4693,16 @@ function ul(s) {
           n = {
             type: o.type,
             keyLength: o.partitionKeyLength,
-            payload: Object.entries(o.parts).map(([c, a]) => ({
-              key: c,
-              value: [a.index.id.toString(), a.values.id.toString()]
+            payload: Object.entries(o.parts).map(([a, c]) => ({
+              key: a,
+              value: [c.index.id.toString(), c.values.id.toString()]
             }))
           };
           break;
         default:
           throw Error(`unsupported resource type: ${i}`);
       }
-      return n.payload.sort((c, a) => c.key.localeCompare(a.key)), n;
+      return n.payload.sort((a, c) => a.key.localeCompare(c.key)), n;
     })
   );
   e.sort((r, o) => r.id.localeCompare(o.id));
@@ -4709,7 +4714,7 @@ async function dl(s, e, t) {
     ...as,
     ...cs(e),
     ...t
-  }, o = new Nr(r.localSecret), n = Xs(r.logger, s, r.localProjections), i = zs(s, r.logger), c = Ys(s, r.logger), a = Qs(s, r.logger), l = new Zs(
+  }, o = new Nr(r.localSecret), n = Xs(r.logger, s, r.localProjections), i = zs(s, r.logger), a = Ys(s, r.logger), c = Qs(s, r.logger), l = new Zs(
     r.logger,
     n,
     i,
@@ -4719,8 +4724,8 @@ async function dl(s, e, t) {
   ), u = new eo(
     r.logger,
     o,
-    c,
     a,
+    c,
     r.uploadDriverOps
   ), d = new to(r.logger, i, r.logStreamDriverOps), f = new ro(r.logger, d, l), h = await so.init(
     r.logger,
@@ -4740,7 +4745,7 @@ async function dl(s, e, t) {
   };
 }
 class ms {
-  constructor(e, t, r, o, n, i, c, a) {
+  constructor(e, t, r, o, n, i, a, c) {
     S(this, "pl");
     /** Contains a reactive list of projects along with their meta information. */
     S(this, "projectList");
@@ -4748,7 +4753,7 @@ class ms {
     // Projects
     //
     S(this, "openedProjectsByRid", /* @__PURE__ */ new Map());
-    this.env = e, this.driverKit = t, this.signer = r, this.projectListResourceId = o, this.openedProjectsList = n, this.projectListTree = i, this.blockRegistryProvider = c, this.projectList = a, this.pl = this.env.pl;
+    this.env = e, this.driverKit = t, this.signer = r, this.projectListResourceId = o, this.openedProjectsList = n, this.projectListTree = i, this.blockRegistryProvider = a, this.projectList = c, this.pl = this.env.pl;
   }
   /** Returns extended API driver kit used internally by middle layer. */
   get internalDriverKit() {
@@ -4839,38 +4844,38 @@ class ms {
         return E.lock(_), E.setField(F, _), await E.commit(), await _.globalId;
       } else
         return N.value;
-    }), i = o.logger, c = await dl(e, t, o), a = new ks(e.httpDispatcher, {
+    }), i = o.logger, a = await dl(e, t, o), c = new ks(e.httpDispatcher, {
       minTimeout: 250,
       maxRetries: 4
-    }), l = new mo(a), u = new Yo(
+    }), l = new mo(c), u = new Yo(
       l,
-      c.signer,
-      a
+      a.signer,
+      c
     ), d = new oo(
       i,
       e.httpDispatcher,
       o.frontendDownloadPath
     ), f = {
       pl: e,
-      signer: c.signer,
+      signer: a.signer,
       logger: i,
       httpDispatcher: e.httpDispatcher,
-      retryHttpDispatcher: a,
+      retryHttpDispatcher: c,
       ops: o,
       bpPreparer: u,
       frontendDownloadDriver: d,
-      driverKit: c,
+      driverKit: a,
       blockUpdateWatcher: new nl(l, i, {
         minDelay: o.devBlockUpdateRecheckInterval,
-        http: a,
+        http: c,
         preferredUpdateChannel: o.preferredUpdateChannel
       }),
       quickJs: await qs()
     }, h = new _s([]), g = await Fo(e, n, h, f);
     return new ms(
       f,
-      c,
-      c.signer,
+      a,
+      a.signer,
       n,
       h,
       g.tree,
@@ -4935,14 +4940,14 @@ async function ql(s, e = {}) {
     bodyLimit: 300,
     ...e
   }, r = [];
-  pl.forEach((a) => {
-    ao(a).subscribe((u) => {
+  pl.forEach((c) => {
+    ao(c).subscribe((u) => {
       var f;
       const d = (/* @__PURE__ */ new Date()).toISOString();
       (f = u == null ? void 0 : u.response) != null && f.headers && (u.response.headers = u.response.headers.map((h) => h.toString())), r.push(
         JSON.stringify({
           timestamp: d,
-          event: a,
+          event: c,
           data: u
         })
       );
@@ -4960,27 +4965,27 @@ async function ql(s, e = {}) {
     const l = await new Kt(n).ping();
     return JSON.stringify(l).slice(0, t.bodyLimit) + "...";
   });
-  const c = new Kt(n).ll.httpDispatcher;
+  const a = new Kt(n).ll.httpDispatcher;
   return o.blockRegistryOverviewChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, c)
+    async () => await ke(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, a)
   ), o.blockGARegistryOverviewChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, c)
+    async () => await ke(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, a)
   ), o.blockRegistryUiChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockRegistryUrl), t, c)
+    async () => await ke(new URL(t.blockUiPath, t.blockRegistryUrl), t, a)
   ), o.blockGARegistryUiChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockGARegistryUrl), t, c)
+    async () => await ke(new URL(t.blockUiPath, t.blockGARegistryUrl), t, a)
   ), o.autoUpdateCdnChecks = await me(
     t.autoUpdateCdnDurationMs,
     t.maxAutoUpdateCdnChecksPerSecond,
-    async () => await ke(t.autoUpdateCdnUrl, t, c)
+    async () => await ke(t.autoUpdateCdnUrl, t, a)
   ), hl(o, s, t, r);
 }
 async function me(s, e, t) {
@@ -4993,13 +4998,13 @@ async function me(s, e, t) {
     } catch (l) {
       i = { ok: !1, error: l };
     }
-    const c = Fr(n);
+    const a = Fr(n);
     o.push({
-      elapsedMs: c,
+      elapsedMs: a,
       response: i
     });
-    const a = 1e3 / e - c;
-    a > 0 && await Vr(a);
+    const c = 1e3 / e - a;
+    c > 0 && await Vr(c);
   }
   return o;
 }
@@ -5015,8 +5020,8 @@ async function ke(s, e, t) {
   };
 }
 function hl(s, e, t, r) {
-  const o = s.plPings.filter((c) => c.response.ok), n = s.plPings.filter((c) => !c.response.ok), i = [
-    ...new Set(o.map((c) => JSON.stringify(c.response.value)))
+  const o = s.plPings.filter((a) => a.response.ok), n = s.plPings.filter((a) => !a.response.ok), i = [
+    ...new Set(o.map((a) => JSON.stringify(a.response.value)))
   ];
   return `
 Network report: