@milaboratories/pl-middle-layer 1.26.5 → 1.27.0

package/dist/index.mjs

@@ -1,14 +1,14 @@
 var Cs = Object.defineProperty;
-var _t = (s, e) => (e = Symbol[s]) ? e : Symbol.for("Symbol." + s), Kt = (s) => {
+var Kt = (s, e) => (e = Symbol[s]) ? e : Symbol.for("Symbol." + s), Ht = (s) => {
   throw TypeError(s);
 };
 var Es = (s, e, t) => e in s ? Cs(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
 var S = (s, e, t) => Es(s, typeof e != "symbol" ? e + "" : e, t);
 var Be = (s, e, t) => {
   if (e != null) {
-    typeof e != "object" && typeof e != "function" && Kt("Object expected");
+    typeof e != "object" && typeof e != "function" && Ht("Object expected");
     var r;
-    t && (r = e[_t("asyncDispose")]), r === void 0 && (r = e[_t("dispose")]), typeof r != "function" && Kt("Object not disposable"), s.push([t, r, e]);
+    t && (r = e[Kt("asyncDispose")]), r === void 0 && (r = e[Kt("dispose")]), typeof r != "function" && Ht("Object not disposable"), s.push([t, r, e]);
   } else t && s.push([t]);
   return e;
 }, je = (s, e, t) => {
@@ -26,34 +26,36 @@ var Be = (s, e, t) => {
   };
   return n();
 };
-import { mapValueInVOE as Br, executePSpecPredicate as ks, mapPObjectData as le, mapPTableDef as gt, JsRenderInternal as Ps, extractConfig as jr, isConfigLambda as xr, DefaultNavigationState as Os, extractAllColumns as $s } from "@platforma-sdk/model";
+import { mapValueInVOE as Br, executePSpecPredicate as Ps, mapPObjectData as ue, mapPTableDef as mt, JsRenderInternal as ks, extractConfig as jr, isConfigLambda as xr, DefaultNavigationState as Os, extractAllColumns as $s } from "@platforma-sdk/model";
 export * from "@platforma-sdk/model";
-import { AnyChannel as we, StableChannel as ie, InitialBlockSettings as Ht, blockPackIdToString as Fs } from "@milaboratories/pl-model-middle-layer";
+import { AnyChannel as we, StableChannel as ae, InitialBlockSettings as Wt, blockPackIdToString as Fs } from "@milaboratories/pl-model-middle-layer";
 export * from "@milaboratories/pl-model-middle-layer";
-import { request as ae, RetryAgent as Is } from "undici";
-import { RegistryV1 as de, tryLoadPackDescription as mt, BlockPackMetaEmbedAbsoluteBytes as As, RegistryV2Reader as Ts, folderReaderByUrl as Ls, loadPackDescription as Wt } from "@platforma-sdk/block-tools";
+export * from "@milaboratories/pl-deployments";
+import { request as ce, RetryAgent as Is } from "undici";
+import { RegistryV1 as de, tryLoadPackDescription as vt, BlockPackMetaEmbedAbsoluteBytes as As, RegistryV2Reader as Ts, folderReaderByUrl as Ls, loadPackDescription as qt } from "@platforma-sdk/block-tools";
 import X from "node:fs";
 import G from "node:path";
 import Ns from "yaml";
 import { assertNever as M, notEmpty as B, ConsoleLoggerAdapter as Ds, ConcurrencyLimitingExecutor as Bs, HmacSha256Signer as Vr } from "@milaboratories/ts-helpers";
 import * as Ur from "node:fs/promises";
 import { tryResolve as js } from "@milaboratories/resolve-helper";
-import { resourceTypesEqual as ce, field as j, Pl as L, PlClient as xs, isNullResourceId as qe, ensureResourceIdNotNull as vt, isResource as Vs, isResourceRef as Us, isNotNullResourceId as qt, resourceType as Le, resourceTypeToString as Js, resourceIdToString as Jr, isNotFoundError as Gs, isTimeoutOrCancelError as Ms, toGlobalResourceId as _s, plAddressToConfig as Ks, UnauthenticatedPlClient as zt } from "@milaboratories/pl-client";
+import { resourceTypesEqual as le, field as j, Pl as L, PlClient as xs, isNullResourceId as ze, ensureResourceIdNotNull as yt, isResource as Vs, isResourceRef as Us, isNotNullResourceId as zt, resourceType as Le, resourceTypeToString as Js, resourceIdToString as Jr, isNotFoundError as Gs, isTimeoutOrCancelError as Ms, toGlobalResourceId as _s, plAddressToConfig as Ks, UnauthenticatedPlClient as Xt } from "@milaboratories/pl-client";
 export * from "@milaboratories/pl-client";
 import { SynchronizedTreeState as Gr, PlError as Hs, isPlTreeNodeAccessor as Ws } from "@milaboratories/pl-tree";
-import { Computable as U, ChangeSource as Xt, PollComputablePool as qs, WatchableValue as zs } from "@milaboratories/computable";
+import { Computable as U, ChangeSource as Yt, PollComputablePool as qs, WatchableValue as zs } from "@milaboratories/computable";
 import { randomUUID as Ie, createHash as Ne } from "node:crypto";
-import { parseTemplate as Xs, PlTemplateV1 as ne, PlTemplateOverrideV1 as Pe, PlTemplateLibV1 as xe, PlTemplateSoftwareV1 as be } from "@milaboratories/pl-model-backend";
+import { parseTemplate as Xs, PlTemplateV1 as ie, PlTemplateOverrideV1 as ke, PlTemplateLibV1 as xe, PlTemplateSoftwareV1 as be } from "@milaboratories/pl-model-backend";
 import Mr from "denque";
 import { Templates as Ys } from "@platforma-sdk/workflow-tengo";
 import re from "canonicalize";
 import Qs from "node:assert";
-import { Scope as yt, getQuickJS as Zs } from "quickjs-emscripten";
+import { Scope as wt, getQuickJS as Zs } from "quickjs-emscripten";
 import { setTimeout as _r } from "node:timers/promises";
 import { createDownloadClient as eo, createLogsClient as to, createUploadBlobClient as ro, createUploadProgressClient as so, DownloadDriver as oo, DownloadBlobToURLDriver as no, UploadDriver as io, LogsStreamDriver as ao, LogsDriver as co, LsDriver as lo, DownloadUrlDriver as uo } from "@milaboratories/pl-drivers";
-import { PFrame as Yt } from "@milaboratories/pframes-node";
-import { LRUCache as po } from "lru-cache";
-import { channel as ho } from "node:diagnostics_channel";
+import { PFrame as Ve } from "@milaboratories/pframes-node";
+import { PFrame as po } from "@milaboratories/pframes-rs-node";
+import { LRUCache as ho } from "lru-cache";
+import { channel as fo } from "node:diagnostics_channel";
 async function Qt(s) {
   try {
     return await Ur.stat(s, { bigint: !0 });
@@ -63,34 +65,34 @@ async function Qt(s) {
     throw e;
   }
 }
-const fo = [de.PlPackageYamlConfigFile], go = [de.PlPackageJsonConfigFile], $t = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], Ft = ["config", "dist", "config.json"], Kr = ["frontend", "dist"], Zt = "block-model/dist/config.json", mo = "block-ui/package.json", vo = [
-  $t,
+const go = [de.PlPackageYamlConfigFile], mo = [de.PlPackageJsonConfigFile], Ft = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], It = ["config", "dist", "config.json"], Kr = ["frontend", "dist"], Zt = "block-model/dist/config.json", vo = "block-ui/package.json", yo = [
   Ft,
-  fo,
+  It,
   go,
+  mo,
   Kr
 ];
-async function yo(s) {
-  return await Qt(G.join(s, ...Ft)) !== void 0 || await Qt(G.join(s, ...$t)) !== void 0;
+async function wo(s) {
+  return await Qt(G.join(s, ...It)) !== void 0 || await Qt(G.join(s, ...Ft)) !== void 0;
 }
-function it(s, e) {
+function at(s, e) {
   const t = js(s, e);
   if (t === void 0) throw new Error(`Can't resolve ${e} against ${s}`);
   return t;
 }
 async function er(s, e) {
-  if (G.isAbsolute(s) || (s = G.resolve(s)), await yo(s))
+  if (G.isAbsolute(s) || (s = G.resolve(s)), await wo(s))
     return {
-      workflow: G.join(s, ...$t),
-      config: G.join(s, ...Ft),
+      workflow: G.join(s, ...Ft),
+      config: G.join(s, ...It),
       ui: G.join(s, ...Kr)
     };
   {
-    const t = it(s, Zt), r = it(s, Zt), o = it(s, mo);
+    const t = at(s, Zt), r = at(s, Zt), o = at(s, vo);
     return { workflow: t, config: r, ui: G.resolve(o, "..", "dist") };
   }
 }
-async function wo(s) {
+async function So(s) {
   try {
     return await X.promises.readFile(s, "utf8");
   } catch (e) {
@@ -99,7 +101,7 @@ async function wo(s) {
     throw e;
   }
 }
-async function So(s) {
+async function bo(s) {
   try {
     return await X.promises.stat(s, { bigint: !0 });
   } catch (e) {
@@ -110,19 +112,19 @@ async function So(s) {
 }
 async function Hr(s) {
   let e = 0n;
-  for (const t of vo) {
-    const r = G.join(s, ...t), o = await So(r);
+  for (const t of yo) {
+    const r = G.join(s, ...t), o = await bo(r);
     o !== void 0 && e < o.mtimeNs && (e = o.mtimeNs);
   }
   return e.toString();
 }
-async function It(s) {
+async function At(s) {
   const e = await X.promises.stat(s.components.workflow.main.file, {
     bigint: !0
   }), t = await X.promises.stat(s.components.model.file, { bigint: !0 });
   return (e.mtimeNs > t.mtimeNs ? e.mtimeNs : t.mtimeNs).toString();
 }
-class Hl {
+class ql {
   constructor(e, t, r) {
     this.v2Provider = e, this.registries = t, this.http = r;
   }
@@ -130,7 +132,7 @@ class Hl {
     const t = [], r = e.spec;
     switch (r.type) {
       case "remote-v1":
-        const o = this.http !== void 0 ? { dispatcher: this.http } : {}, i = await (await ae(
+        const o = this.http !== void 0 ? { dispatcher: this.http } : {}, i = await (await ce(
           `${r.url}/${de.GlobalOverviewPath}`,
           o
         )).body.json();
@@ -160,7 +162,7 @@ class Hl {
             id: f,
             latestByChannel: {
               [we]: h,
-              [ie]: h
+              [ae]: h
             },
             allVersions: c.allVersions.map((g) => ({ version: g, channels: [] }))
           });
@@ -168,14 +170,14 @@ class Hl {
         return t;
       case "remote-v2":
         return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map(
-          (c) => c.latestByChannel[ie] ? {
+          (c) => c.latestByChannel[ae] ? {
             ...c,
             registryId: e.id
           } : {
             ...c,
             latestByChannel: {
               ...c.latestByChannel,
-              [ie]: ((a) => a.spec.type === "from-registry-v2" ? { ...a, spec: { ...a.spec, channel: ie } } : a)(c.latestByChannel[we])
+              [ae]: ((a) => a.spec.type === "from-registry-v2" ? { ...a, spec: { ...a.spec, channel: ae } } : a)(c.latestByChannel[we])
             },
             registryId: e.id
           }
@@ -183,7 +185,7 @@ class Hl {
       case "local-dev":
         for (const c of await X.promises.readdir(r.path, { withFileTypes: !0 })) {
           if (!c.isDirectory()) continue;
-          const a = G.join(r.path, c.name), l = await wo(
+          const a = G.join(r.path, c.name), l = await So(
             G.join(a, de.PlPackageYamlConfigFile)
           );
           if (l !== void 0) {
@@ -212,18 +214,18 @@ class Hl {
               id: f,
               latestByChannel: {
                 [we]: h,
-                [ie]: h
+                [ae]: h
               },
               allVersions: []
             });
           } else {
-            let u = a, d = await mt(u);
+            let u = a, d = await vt(u);
             if (d === void 0) {
               for (const f of ["block", "meta"])
-                if (u = G.join(a, f), d = await mt(u), d !== void 0) break;
+                if (u = G.join(a, f), d = await vt(u), d !== void 0) break;
             }
             if (d !== void 0) {
-              const f = await It(d), h = {
+              const f = await At(d), h = {
                 id: d.id,
                 meta: await As.parseAsync(d.meta),
                 spec: {
@@ -237,7 +239,7 @@ class Hl {
                 id: d.id,
                 latestByChannel: {
                   [we]: h,
-                  [ie]: h
+                  [ae]: h
                 },
                 allVersions: []
               });
@@ -266,7 +268,7 @@ class Hl {
     return await this.v2Provider.getRegistry(o.url).getSpecificOverview(t, r);
   }
 }
-class bo {
+class Ro {
   constructor(e) {
     S(this, "registries", /* @__PURE__ */ new Map());
     this.http = e;
@@ -278,58 +280,58 @@ class bo {
     return this.registries.set(e, r), r;
   }
 }
-const Wl = {
+const zl = {
   type: "remote-v2",
   url: "https://blocks.pl-open.science/"
-}, ql = {
+}, Xl = {
   type: "remote-v1",
   url: "https://block.registry.platforma.bio/releases"
-}, zl = {
+}, Yl = {
   type: "remote-v1",
   url: "https://block.registry.platforma.bio/dev"
-}, Ro = {
-  groups: [{ id: "default", label: "Default", blocks: [] }]
 }, Co = {
+  groups: [{ id: "default", label: "Default", blocks: [] }]
+}, Eo = {
   stagingRefreshTimestamp: 0,
   blocksInLimbo: []
-}, Eo = {
+}, Po = {
   label: "New Project"
-}, ko = { name: "UserProject", version: "2" }, Wr = "SchemaVersion", qr = "1", At = "ProjectCreated", Ae = "ProjectLastModified", Te = "ProjectMeta", pe = "ProjectStructure", ze = "BlockRenderingState", Po = "BlockFrontendState/", Oo = /^BlockFrontendState\/(?<blockid>.*)$/;
-function wt(s) {
-  return `${Po}${s}`;
-}
-const $o = "BlockArgsAuthor/";
+}, ko = { name: "UserProject", version: "2" }, Wr = "SchemaVersion", qr = "1", Tt = "ProjectCreated", Ae = "ProjectLastModified", Te = "ProjectMeta", pe = "ProjectStructure", Xe = "BlockRenderingState", Oo = "BlockFrontendState/", $o = /^BlockFrontendState\/(?<blockid>.*)$/;
 function St(s) {
-  return `${$o}${s}`;
+  return `${Oo}${s}`;
+}
+const Fo = "BlockArgsAuthor/";
+function bt(s) {
+  return `${Fo}${s}`;
 }
-const bt = "ProjectStructureAuthor";
-function Fo(s) {
-  const e = s.match(Oo);
+const Rt = "ProjectStructureAuthor";
+function Io(s) {
+  const e = s.match($o);
   if (e !== null)
     return e.groups.blockid;
 }
-const Io = "__serviceTemplate_";
-function Rt(s) {
-  return `${Io}${s}`;
+const Ao = "__serviceTemplate_";
+function Ct(s) {
+  return `${Ao}${s}`;
 }
 function V(s, e) {
   return `${s}-${e}`;
 }
-const Ao = /^(?<blockId>.*)-(?<fieldName>blockPack|blockSettings|prodArgs|currentArgs|prodCtx|prodUiCtx|prodOutput|prodCtxPrevious|prodUiCtxPrevious|prodOutputPrevious|stagingCtx|stagingUiCtx|stagingOutput|stagingCtxPrevious|stagingUiCtxPrevious|stagingOutputPrevious)$/;
-function To(s) {
-  const e = s.match(Ao);
+const To = /^(?<blockId>.*)-(?<fieldName>blockPack|blockSettings|prodArgs|currentArgs|prodCtx|prodUiCtx|prodOutput|prodCtxPrevious|prodUiCtxPrevious|prodOutputPrevious|stagingCtx|stagingUiCtx|stagingOutput|stagingCtxPrevious|stagingUiCtxPrevious|stagingOutputPrevious)$/;
+function Lo(s) {
+  const e = s.match(To);
   if (e === null) return;
   const { blockId: t, fieldName: r } = e.groups;
   return { blockId: t, fieldName: r };
 }
-const Lo = "projects", zr = { name: "Projects", version: "1" }, No = (s) => ce(s.type, zr) ? s.fields : [];
-async function Do(s, e, t, r) {
+const No = "projects", zr = { name: "Projects", version: "1" }, Do = (s) => le(s.type, zr) ? s.fields : [];
+async function Bo(s, e, t, r) {
   const o = await Gr.init(
     s,
     e,
     {
       ...r.ops.defaultTreeOptions,
-      pruning: No
+      pruning: Do
     },
     r.logger
   );
@@ -340,7 +342,7 @@ async function Do(s, e, t, r) {
     for (const u of c.listDynamicFields()) {
       const d = c.traverse(u);
       if (d === void 0) continue;
-      const f = B(d.getKeyValueAsJson(Te)), h = B(d.getKeyValueAsJson(At)), g = B(d.getKeyValueAsJson(Ae));
+      const f = B(d.getKeyValueAsJson(Te)), h = B(d.getKeyValueAsJson(Tt)), g = B(d.getKeyValueAsJson(Ae));
       l.push({
         id: u,
         rid: d.id,
@@ -353,40 +355,40 @@ async function Do(s, e, t, r) {
     return l.sort((u) => -u.lastModified.valueOf()), l;
   }).withStableType(), tree: o };
 }
-const Bo = {
+const jo = {
   name: "EphRenderTemplate",
   version: "1"
-}, jo = {
+}, xo = {
   name: "RenderTemplate",
   version: "1"
 };
 function Xr(s, e, t, r, o) {
   if (o.length === 0) throw new Error("Zero output names provided");
-  const n = t ? s.createEphemeral(Bo) : s.createStruct(jo), i = j(n, "template"), c = j(n, "inputs");
+  const n = t ? s.createEphemeral(jo) : s.createStruct(xo), 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 xo = { name: "BContextEnd", version: "1" }, Vo = { name: "BContext", version: "1" }, Uo = "id", Jo = "parent/", Go = ["context", "result"];
+const Vo = { name: "BContextEnd", version: "1" }, Uo = { name: "BContext", version: "1" }, Jo = "id", Go = "parent/", Mo = ["context", "result"];
 function tr(s, e, t) {
-  return Xr(s, e, !0, t, Go);
+  return Xr(s, e, !0, t, Mo);
 }
-function Mo(s) {
-  const e = s.createEphemeral(xo);
+function _o(s) {
+  const e = s.createEphemeral(Vo);
   return s.lock(e), e;
 }
-function _o(s, e) {
-  if (e.length === 0) return Mo(s);
+function Ko(s, e) {
+  if (e.length === 0) return _o(s);
   if (e.length === 1) return e[0];
-  const t = s.createEphemeral(Vo);
-  s.createField(j(t, Uo), "Input", L.createPlString(s, Ie()));
+  const t = s.createEphemeral(Uo);
+  s.createField(j(t, Jo), "Input", L.createPlString(s, Ie()));
   for (let r = 0; r < e.length; r++)
-    s.createField(j(t, `${Jo}${r}`), "Input", e[r]);
+    s.createField(j(t, `${Go}${r}`), "Input", e[r]);
   return s.lock(t), t;
 }
-function Ko(s, e) {
+function Ho(s, e) {
   const t = Xs(e.content), r = t.type;
   switch (r) {
     case "pl.tengo-template.v2":
-      return Wo(s, t);
+      return qo(s, t);
     default:
       M(r);
   }
@@ -401,7 +403,7 @@ const rr = {
       JSON.stringify(xe.fromV2Data(s).data)
     );
   }
-}, Ve = {
+}, Ue = {
   hash(s, e) {
     e.update(be.type.name).update(be.type.version).update(s.name).update(s.version).update(s.src);
   },
@@ -409,56 +411,56 @@ const rr = {
     const r = be.fromV2Data(s), o = e.createStruct(be.type, r.data);
     return e.setKValue(o, be.metaNameKey, JSON.stringify(r.name)), e.lock(o), o;
   }
-}, Ho = {
+}, Wo = {
   hash(s, e) {
-    e.update(Pe.type.name).update(Pe.type.version).update(s.hashOverride ?? "");
+    e.update(ke.type.name).update(ke.type.version).update(s.hashOverride ?? "");
   },
   render(s, e, t) {
     return e.createStruct(
-      Pe.type,
-      JSON.stringify(Pe.fromV2Data(s))
+      ke.type,
+      JSON.stringify(ke.fromV2Data(s))
     );
   }
 }, Yr = {
   hash(s, e) {
-    e.update(ne.type.name).update(ne.type.version).update(s.hashOverride ?? "").update(s.name).update(s.version).update(s.src);
+    e.update(ie.type.name).update(ie.type.version).update(s.hashOverride ?? "").update(s.name).update(s.version).update(s.src);
     const t = (r) => (r.sort((o, n) => o[0] === n[0] ? 0 : o[0] < n[0] ? -1 : 1), r);
     for (const [r, o] of t(Object.entries(s.libs ?? {})))
       e.update("lib:" + r), rr.hash(o, e);
     for (const [r, o] of t(Object.entries(s.software ?? {})))
-      e.update("soft:" + r), Ve.hash(o, e);
+      e.update("soft:" + r), Ue.hash(o, e);
     for (const [r, o] of t(Object.entries(s.assets ?? {})))
-      e.update("asset:" + r), Ve.hash(o, e);
+      e.update("asset:" + r), Ue.hash(o, e);
     for (const [r, o] of t(Object.entries(s.templates ?? {})))
       e.update("tpl:" + r), this.hash(o, e);
   },
   render(s, e, t) {
     const r = e.createStruct(
-      ne.type,
-      JSON.stringify(ne.fromV2Data(s).data)
+      ie.type,
+      JSON.stringify(ie.fromV2Data(s).data)
     );
     for (const [i, c] of Object.entries(s.libs ?? {})) {
-      const a = ne.libField(r, i);
+      const a = ie.libField(r, i);
       e.createField(a, "Input"), e.setField(a, t(c, rr));
     }
     for (const [i, c] of Object.entries(s.software ?? {})) {
-      const a = ne.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Ve));
+      const a = ie.swField(r, i);
+      e.createField(a, "Input"), e.setField(a, t(c, Ue));
     }
     for (const [i, c] of Object.entries(s.assets ?? {})) {
-      const a = ne.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Ve));
+      const a = ie.swField(r, i);
+      e.createField(a, "Input"), e.setField(a, t(c, Ue));
     }
     for (const [i, c] of Object.entries(s.templates ?? {})) {
-      const a = ne.tplField(r, i);
+      const a = ie.tplField(r, i);
       e.createField(a, "Input"), e.setField(a, t(c, Yr));
     }
     if (e.lock(r), !s.hashOverride) return r;
-    const o = t(s, Ho), n = Pe.tplField(o);
+    const o = t(s, Wo), n = ke.tplField(o);
     return e.createField(n, "Service"), e.setField(n, r), e.lock(r), o;
   }
 };
-function Wo(s, e) {
+function qo(s, e) {
   const t = /* @__PURE__ */ new Map(), r = (o, n) => {
     const i = Ne("sha256");
     n.hash(o, i);
@@ -471,11 +473,11 @@ function Wo(s, e) {
   };
   return r(e, Yr);
 }
-const qo = { name: "TengoTemplateGet", version: "1" }, zo = "registry", Xo = "templateURI", Yo = "template", Xl = { name: "TengoTemplatePack", version: "1" }, Yl = {
+const zo = { name: "TengoTemplateGet", version: "1" }, Xo = "registry", Yo = "templateURI", Qo = "template", Ql = { name: "TengoTemplatePack", version: "1" }, Zl = {
   name: "TengoTemplatePackConvert",
   version: "1"
-}, Ql = "templatePack", Zl = "template";
-async function Qo(s) {
+}, eu = "templatePack", tu = "template";
+async function Zo(s) {
   switch (s.type) {
     case "from-file":
       return {
@@ -489,16 +491,16 @@ async function Qo(s) {
       return M(s);
   }
 }
-function Zo(s, e) {
-  const t = s.createStruct(qo), r = j(t, zo), o = j(t, Xo), n = j(t, Yo);
+function en(s, e) {
+  const t = s.createStruct(zo), r = j(t, Xo), o = j(t, Yo), n = j(t, Qo);
   return s.setField(r, s.createValue(L.JsonString, Buffer.from(JSON.stringify(e.registry)))), s.setField(o, s.createValue(L.JsonString, Buffer.from(JSON.stringify(e.path)))), n;
 }
-function Tt(s, e) {
+function Lt(s, e) {
   switch (e.type) {
     case "from-registry":
-      return Zo(s, e);
+      return en(s, e);
     case "explicit":
-      return Ko(s, e);
+      return Ho(s, e);
     default:
       return M(e);
   }
@@ -507,7 +509,7 @@ const Qr = { name: "Frontend/FromUrl", version: "1" }, Zr = {
   name: "Frontend/FromFolder",
   version: "1"
 };
-function en(s, e) {
+function tn(s, e) {
   switch (e.type) {
     case "url":
       return s.createValue(
@@ -526,11 +528,11 @@ function en(s, e) {
       return M(e);
   }
 }
-const tn = { name: "BlockPackCustom", version: "1" }, es = "template", ts = "frontend";
+const rn = { name: "BlockPackCustom", version: "1" }, es = "template", ts = "frontend";
 function sr(s) {
   return s.endsWith("/") ? s : `${s}/`;
 }
-class rn {
+class sn {
   constructor(e, t, r) {
     this.v2RegistryProvider = e, this.signer = t, this.http = r;
   }
@@ -543,18 +545,18 @@ class rn {
         return JSON.parse(r);
       }
       case "dev-v2": {
-        const t = await Wt(e.folder), r = await X.promises.readFile(t.components.model.file, {
+        const t = await qt(e.folder), r = await X.promises.readFile(t.components.model.file, {
           encoding: "utf-8"
         });
         return JSON.parse(r);
       }
       case "from-registry-v1": {
         const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${sr(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`;
-        return await (await ae(`${r}/config.json`, t)).body.json();
+        return await (await ce(`${r}/config.json`, t)).body.json();
       }
       case "from-registry-v2": {
         const t = this.http !== void 0 ? { dispatcher: this.http } : {}, o = await this.v2RegistryProvider.getRegistry(e.registryUrl).getComponents(e.id);
-        return await (await ae(o.model.url, t)).body.json();
+        return await (await ce(o.model.url, t)).body.json();
       }
       default:
         return M(e);
@@ -584,14 +586,14 @@ class rn {
         };
       }
       case "dev-v2": {
-        const t = await Wt(e.folder), r = JSON.parse(
+        const t = await qt(e.folder), r = JSON.parse(
           await X.promises.readFile(t.components.model.file, {
             encoding: "utf-8"
           })
         ), o = await X.promises.readFile(
           t.components.workflow.main.file
         ), n = t.components.ui.folder, i = { ...e };
-        return e.mtime === void 0 && (i.mtime = await It(t)), {
+        return e.mtime === void 0 && (i.mtime = await At(t)), {
           type: "explicit",
           template: {
             type: "explicit",
@@ -607,12 +609,12 @@ class rn {
         };
       }
       case "from-registry-v1": {
-        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${sr(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, o = `${r}/template.plj.gz`, n = await ae(o, t);
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${sr(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, o = `${r}/template.plj.gz`, n = await ce(o, t);
         if (n.statusCode !== 200)
           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()), a = await (await ce(`${r}/config.json`, t)).body.json();
         return {
           type: "explicit",
           template: {
@@ -628,7 +630,7 @@ class rn {
         };
       }
       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 ce(o.model.url, t)).body.json(), i = async () => await (await ce(o.workflow.main.url, t)).body.arrayBuffer(), [c, a] = await Promise.all([n(), i()]);
         return {
           type: "explicit",
           template: {
@@ -648,25 +650,25 @@ class rn {
     }
   }
 }
-function sn(s, e) {
-  const t = { config: e.config, source: e.source }, r = s.createStruct(tn, JSON.stringify(t));
-  return s.createField(j(r, es), "Input", Tt(s, e.template)), s.createField(j(r, ts), "Input", en(s, e.frontend)), s.lock(r), r;
+function on(s, e) {
+  const t = { config: e.config, source: e.source }, r = s.createStruct(rn, JSON.stringify(t));
+  return s.createField(j(r, es), "Input", Lt(s, e.template)), s.createField(j(r, ts), "Input", tn(s, e.frontend)), s.lock(r), r;
 }
 function or(s, e) {
   switch (e.type) {
     case "explicit":
-      return sn(s, e);
+      return on(s, e);
     default:
       return M(e.type);
   }
 }
-function Ue(s, e) {
+function Je(s, e) {
   return { __isRef: !0, blockId: s, name: e };
 }
-function on(s) {
+function nn(s) {
   return typeof s == "object" && s !== null && s.__isRef === !0 && "blockId" in s && "name" in s;
 }
-function Ct(s, e, t) {
+function Et(s, e, t) {
   const r = typeof e;
   switch (r) {
     case "function":
@@ -679,23 +681,23 @@ function Ct(s, e, t) {
       return;
     case "object":
       if (e === null) return;
-      if (on(e))
+      if (nn(e))
         t === void 0 || t.has(e.blockId) ? s.upstreams.add(e.blockId) : s.missingReferences = !0;
       else if (Array.isArray(e))
-        for (const o of e) Ct(s, o, t);
+        for (const o of e) Et(s, o, t);
       else
         for (const [, o] of Object.entries(e))
-          Ct(s, o, t);
+          Et(s, o, t);
       return;
     default:
       M(r);
   }
 }
-function nn(s, e) {
+function an(s, e) {
   const t = { upstreams: /* @__PURE__ */ new Set(), missingReferences: !1 };
-  return Ct(t, s, e), t;
+  return Et(t, s, e), t;
 }
-function te(s) {
+function se(s) {
   return {
     *[Symbol.iterator]() {
       for (const e of s.groups) for (const t of e.blocks) yield t;
@@ -732,10 +734,10 @@ class rs {
     }
   }
 }
-function Et(s) {
+function Pt(s) {
   const e = /* @__PURE__ */ new Map();
   let t;
-  for (const { id: r } of te(s)) {
+  for (const { id: r } of se(s)) {
     const o = {
       id: r,
       missingReferences: !1
@@ -744,12 +746,12 @@ function Et(s) {
   }
   return t !== void 0 && (t.downstream = /* @__PURE__ */ new Set()), new rs(e);
 }
-function We(s, e) {
+function qe(s, e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
-  for (const { id: o } of te(s)) {
+  for (const { id: o } of se(s)) {
     const n = e(o);
     if (n === void 0) continue;
-    const i = nn(n, r), c = {
+    const i = an(n, r), c = {
       id: o,
       missingReferences: i.missingReferences,
       upstream: i.upstreams,
@@ -760,7 +762,7 @@ function We(s, e) {
   }
   return new rs(t);
 }
-function an(s, e) {
+function cn(s, e) {
   if (s.size !== e.size) return !1;
   for (const t of s) if (!e.has(t)) return !1;
   return !0;
@@ -774,25 +776,25 @@ function nr(s, e) {
   const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set();
   return s.nodes.forEach((n) => {
     const i = e.nodes.get(n.id);
-    i === void 0 ? t.add(n.id) : (!an(n.upstream, i.upstream) || kt(n.upstream, o)) && o.add(n.id);
+    i === void 0 ? t.add(n.id) : (!cn(n.upstream, i.upstream) || kt(n.upstream, o)) && o.add(n.id);
   }), e.nodes.forEach((n) => {
     s.nodes.has(n.id) ? kt(n.upstream, o) && o.add(n.id) : r.add(n.id);
   }), { onlyInA: t, onlyInB: r, different: o };
 }
-let at;
+let ct;
 async function ss() {
-  if (at === void 0) {
-    const s = await Qo(Ys["pframes.export-pframe"]);
+  if (ct === void 0) {
+    const s = await Zo(Ys["pframes.export-pframe"]);
     if (s.type !== "explicit") throw new Error("Unexpected prepared template type.");
     const e = Ne("sha256").update(s.content).digest("hex");
-    at = { spec: s, hash: e };
+    ct = { spec: s, hash: e };
   }
-  return at;
+  return ct;
 }
-function cn(s, e, t) {
+function ln(s, e, t) {
   return Xr(s, e, !0, { pf: t }, ["result"]).result;
 }
-function ct(s, e) {
+function lt(s, e) {
   let t = !1, r, o;
   return () => {
     if (!t)
@@ -803,11 +805,11 @@ function ct(s, e) {
 }
 class ir {
   constructor(e, t) {
-    S(this, "currentInputsC", ct(
+    S(this, "currentInputsC", lt(
       () => this.fields.currentArgs.modCount,
       () => JSON.parse(Buffer.from(this.fields.currentArgs.value).toString())
     ));
-    S(this, "actualProductionInputsC", ct(
+    S(this, "actualProductionInputsC", lt(
       () => {
         var e;
         return (e = this.fields.prodArgs) == null ? void 0 : e.modCount;
@@ -819,7 +821,7 @@ class ir {
           return JSON.parse(Buffer.from(e).toString());
       }
     ));
-    S(this, "productionStaleC", ct(
+    S(this, "productionStaleC", lt(
       () => {
         var e;
         return `${this.fields.currentArgs.modCount}_${(e = this.fields.prodArgs) == null ? void 0 : e.modCount}`;
@@ -870,10 +872,10 @@ class ir {
     );
   }
 }
-const ln = (s) => {
+const un = (s) => {
   throw new Error(`No new block info for ${s}`);
 };
-class Xe {
+class Ye {
   constructor(e, t, r, o, n, i, c, a, l, u, d, f) {
     S(this, "globalModCount", 0);
     S(this, "fieldsChanged", !1);
@@ -901,7 +903,7 @@ class Xe {
     });
     let e;
     this.blockInfos.forEach((t) => {
-      t.fields.blockSettings === void 0 && (e === void 0 && (e = this.createJsonFieldValue(Ht)), this.setBlockFieldObj(t.id, "blockSettings", e));
+      t.fields.blockSettings === void 0 && (e === void 0 && (e = this.createJsonFieldValue(Wt)), this.setBlockFieldObj(t.id, "blockSettings", e));
     });
   }
   get wasModified() {
@@ -911,16 +913,16 @@ class Xe {
     return JSON.parse(JSON.stringify(this.struct));
   }
   getStagingGraph() {
-    return this.stagingGraph === void 0 && (this.stagingGraph = Et(this.struct)), this.stagingGraph;
+    return this.stagingGraph === void 0 && (this.stagingGraph = Pt(this.struct)), this.stagingGraph;
   }
   getPendingProductionGraph() {
-    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = We(
+    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = qe(
       this.struct,
       (e) => this.getBlockInfo(e).currentInputs
     )), this.pendingProductionGraph;
   }
   getActualProductionGraph() {
-    return this.actualProductionGraph === void 0 && (this.actualProductionGraph = We(
+    return this.actualProductionGraph === void 0 && (this.actualProductionGraph = qe(
       this.struct,
       (e) => this.getBlockInfo(e).actualProductionInputs
     )), this.actualProductionGraph;
@@ -941,7 +943,7 @@ class Xe {
     return this.createJsonFieldValueByContent(JSON.stringify(e));
   }
   getBlock(e) {
-    for (const t of te(this.struct)) if (t.id === e) return t;
+    for (const t of se(this.struct)) if (t.id === e) return t;
     throw new Error("block not found");
   }
   setBlockFieldObj(e, t, r) {
@@ -1031,10 +1033,10 @@ class Xe {
       if (n.fields[t] === void 0 || n.fields[t].ref === void 0)
         throw new Error("One of the upstreams staging is not rendered.");
       r.push(L.unwrapHolder(this.tx, n.fields[t].ref));
-    }), _o(this.tx, r);
+    }), Ko(this.tx, r);
   }
   exportCtx(e) {
-    return cn(this.tx, L.unwrapHolder(this.tx, this.ctxExportTplHolder), e);
+    return ln(this.tx, L.unwrapHolder(this.tx, this.ctxExportTplHolder), e);
   }
   renderStagingFor(e) {
     this.resetStaging(e);
@@ -1078,8 +1080,8 @@ class Xe {
   // Structure changes
   //
   /** Very generic method, better check for more specialized case-specific methods first. */
-  updateStructure(e, t = ln) {
-    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = Et(e), i = We(
+  updateStructure(e, t = un) {
+    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = Pt(e), i = qe(
       e,
       (l) => {
         var u;
@@ -1097,7 +1099,7 @@ class Xe {
       this.setBlockField(l, "blockPack", L.wrapInHolder(this.tx, f), "NotReady"), this.setBlockFieldObj(
         l,
         "blockSettings",
-        this.createJsonFieldValue(Ht)
+        this.createJsonFieldValue(Wt)
       ), 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);
@@ -1175,7 +1177,7 @@ class Xe {
             throw new Error("Can't render blocks not including all upstreams.");
       }
     const n = /* @__PURE__ */ new Set();
-    for (const i of te(this.structure)) {
+    for (const i of se(this.structure)) {
       if (!r.has(i.id)) continue;
       let c = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
       if (!c) {
@@ -1255,14 +1257,14 @@ class Xe {
   assignAuthorMarkers() {
     const e = this.author ? JSON.stringify(this.author) : void 0;
     for (const t of this.blocksWithChangedInputs)
-      e === void 0 ? this.tx.deleteKValue(this.rid, St(t)) : this.tx.setKValue(this.rid, St(t), e);
-    (this.metaChanged || this.structureChanged) && (e === void 0 ? this.tx.deleteKValue(this.rid, bt) : this.tx.setKValue(this.rid, bt, e));
+      e === void 0 ? this.tx.deleteKValue(this.rid, bt(t)) : this.tx.setKValue(this.rid, bt(t), e);
+    (this.metaChanged || this.structureChanged) && (e === void 0 ? this.tx.deleteKValue(this.rid, Rt) : this.tx.setKValue(this.rid, Rt, e));
   }
   save() {
     if (this.wasModified) {
       this.lastModifiedChanged && this.tx.setKValue(this.rid, Ae, JSON.stringify(this.lastModified)), this.structureChanged && this.tx.setKValue(this.rid, pe, JSON.stringify(this.struct)), this.renderingStateChanged && this.tx.setKValue(
         this.rid,
-        ze,
+        Xe,
         JSON.stringify({
           ...this.renderingState,
           blocksInLimbo: [...this.blocksInLimbo]
@@ -1270,13 +1272,13 @@ class Xe {
       ), this.metaChanged && this.tx.setKValue(this.rid, Te, JSON.stringify(this.meta));
       for (const e of this.changedBlockFrontendStates) {
         const t = this.blockFrontendStates.get(e);
-        t === void 0 ? this.tx.deleteKValue(this.rid, wt(e)) : this.tx.setKValue(this.rid, wt(e), t);
+        t === void 0 ? this.tx.deleteKValue(this.rid, St(e)) : this.tx.setKValue(this.rid, St(e), t);
       }
       this.assignAuthorMarkers();
     }
   }
   static async load(e, t, r) {
-    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Wr), i = e.getKValueJson(t, Ae), c = e.getKValueJson(t, Te), a = e.getKValueJson(t, pe), l = e.getKValueJson(t, ze), u = e.listKeyValuesString(t), [
+    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Wr), i = e.getKValueJson(t, Ae), c = e.getKValueJson(t, Te), a = e.getKValueJson(t, pe), l = e.getKValueJson(t, Xe), u = e.listKeyValuesString(t), [
       d,
       f,
       h,
@@ -1297,32 +1299,32 @@ class Xe {
       throw new Error(
         `Can't act on this project resource because it has a wrong schema version: ${f}`
       );
-    const P = /* @__PURE__ */ new Map();
+    const k = /* @__PURE__ */ new Map();
     for (const p of d.fields) {
-      const y = To(p.name);
+      const y = Lo(p.name);
       if (y === void 0) continue;
-      let m = P.get(y.blockId);
+      let m = k.get(y.blockId);
       m === void 0 && (m = {
         id: y.blockId,
         fields: {}
-      }, P.set(y.blockId, m)), m.fields[y.fieldName] = qe(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
+      }, k.set(y.blockId, m)), m.fields[y.fieldName] = ze(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
     }
-    const se = await ss(), he = Rt(se.hash), T = d.fields.find(
+    const oe = await ss(), he = Ct(oe.hash), T = d.fields.find(
       (p) => p.name === he
     );
     let q;
-    T !== void 0 ? q = vt(T.value) : (q = L.wrapInHolder(e, Tt(e, se.spec)), e.createField(
-      j(t, Rt(se.hash)),
+    T !== void 0 ? q = yt(T.value) : (q = L.wrapInHolder(e, Lt(e, oe.spec)), e.createField(
+      j(t, Ct(oe.hash)),
       "Dynamic",
       q
     ));
-    const oe = { stagingRefreshTimestamp: I }, H = new Set(N), J = /* @__PURE__ */ new Map();
+    const ne = { stagingRefreshTimestamp: I }, H = new Set(N), J = /* @__PURE__ */ new Map();
     for (const p of K) {
-      const y = Fo(p.key);
+      const y = Io(p.key);
       y !== void 0 && J.set(y, p.value);
     }
     const x = [];
-    P.forEach(({ id: p, fields: y }) => {
+    k.forEach(({ id: p, fields: y }) => {
       for (const [, m] of Object.entries(y))
         if (m.ref !== void 0) {
           if (!Vs(m.ref) || Us(m.ref))
@@ -1332,12 +1334,12 @@ class Xe {
     });
     for (const [p, y] of x) {
       const m = await y;
-      p.value = m.data, qt(m.error) ? p.status = "Error" : m.resourceReady || qt(m.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
+      p.value = m.data, zt(m.error) ? p.status = "Error" : m.resourceReady || zt(m.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
     }
     const z = /* @__PURE__ */ new Map();
-    P.forEach(({ id: p, fields: y }) => z.set(p, new ir(p, y)));
+    k.forEach(({ id: p, fields: y }) => z.set(p, new ir(p, y)));
     const fe = /* @__PURE__ */ new Set();
-    for (const p of te(C)) {
+    for (const p of se(C)) {
       if (!z.has(p.id))
         throw new Error(`Inconsistent project structure: no inputs for ${p.id}`);
       fe.add(p.id);
@@ -1347,7 +1349,7 @@ class Xe {
         throw new Error(`Inconsistent project structure: no structure entry for ${p.id}`);
       p.check();
     });
-    const v = new Xe(
+    const v = new Ye(
       t,
       e,
       r,
@@ -1355,7 +1357,7 @@ class Xe {
       h,
       g,
       C,
-      oe,
+      ne,
       H,
       z,
       J,
@@ -1364,33 +1366,33 @@ class Xe {
     return v.fixProblemsAndMigrate(), v;
   }
 }
-async function un(s, e = Eo) {
+async function dn(s, e = Po) {
   const t = s.createEphemeral(ko);
   s.lock(t);
   const r = String(Date.now());
-  s.setKValue(t, Wr, JSON.stringify(qr)), s.setKValue(t, At, r), s.setKValue(t, Ae, r), s.setKValue(t, Te, JSON.stringify(e)), s.setKValue(t, pe, JSON.stringify(Ro)), s.setKValue(t, ze, JSON.stringify(Co));
+  s.setKValue(t, Wr, JSON.stringify(qr)), s.setKValue(t, Tt, r), s.setKValue(t, Ae, r), s.setKValue(t, Te, JSON.stringify(e)), s.setKValue(t, pe, JSON.stringify(Co)), s.setKValue(t, Xe, JSON.stringify(Eo));
   const o = await ss();
   return s.createField(
-    j(t, Rt(o.hash)),
+    j(t, Ct(o.hash)),
     "Dynamic",
-    L.wrapInHolder(s, Tt(s, o.spec))
+    L.wrapInHolder(s, Lt(s, o.spec))
   ), t;
 }
-async function Je(s, e, t) {
+async function Ge(s, e, t) {
   return Y(s, e, void 0, t);
 }
 async function Y(s, e, t, r) {
   if (s instanceof xs)
     return await s.withWriteTx("ProjectAction", async (o) => {
-      const n = await Xe.load(o, e, t), i = await r(n);
+      const n = await Ye.load(o, e, t), i = await r(n);
       return n.wasModified && (n.save(), await o.commit()), i;
     });
   {
-    const o = await Xe.load(s, e, t), n = await r(o);
+    const o = await Ye.load(s, e, t), n = await r(o);
     return o.save(), n;
   }
 }
-function* dn(s) {
+function* pn(s) {
   switch (s.type) {
     case "Json":
       return;
@@ -1410,7 +1412,7 @@ function ar(s, e) {
     Object.entries(s).map(([t, r]) => [t, e(r, t)])
   );
 }
-function pn(s, e) {
+function hn(s, e) {
   switch (s.type) {
     case "Json":
       return { ...s };
@@ -1428,26 +1430,26 @@ function pn(s, e) {
       M(s);
   }
 }
-const hn = Le("PColumnData/JsonPartitioned", "1"), fn = Le(
+const fn = Le("PColumnData/JsonPartitioned", "1"), gn = Le(
   "PColumnData/Partitioned/JsonPartitioned",
   "1"
-), gn = Le("PColumnData/BinaryPartitioned", "1"), mn = Le(
+), mn = Le("PColumnData/BinaryPartitioned", "1"), vn = Le(
   "PColumnData/Partitioned/BinaryPartitioned",
   "1"
-), vn = Le("PColumnData/Json", "1");
-function yn(s) {
+), yn = Le("PColumnData/Json", "1");
+function wn(s) {
   if (!s.getIsReadyOrError()) throw new Error("Data not ready.");
   const e = s.getDataAsJson();
   if (e === void 0)
     throw new Error("unexpected data info structure, no resource data");
-  if (ce(s.resourceType, vn)) {
+  if (le(s.resourceType, yn)) {
     const t = e;
     return {
       type: "Json",
       keyLength: t.keyLength,
       data: t.data
     };
-  } else if (ce(s.resourceType, hn)) {
+  } else if (le(s.resourceType, fn)) {
     const t = e, r = Object.fromEntries(
       s.listInputFields().map((o) => [o, s.traverse({ field: o, errorIfFieldNotSet: !0 }).resourceInfo])
     );
@@ -1456,7 +1458,7 @@ function yn(s) {
       partitionKeyLength: t.partitionKeyLength,
       parts: r
     };
-  } else if (ce(s.resourceType, fn)) {
+  } else if (le(s.resourceType, gn)) {
     const t = e, r = {};
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
@@ -1471,7 +1473,7 @@ function yn(s) {
       partitionKeyLength: t.superPartitionKeyLength + t.partitionKeyLength,
       parts: r
     };
-  } else if (ce(s.resourceType, gn)) {
+  } else if (le(s.resourceType, mn)) {
     const t = e, r = {};
     for (const o of s.listInputFields())
       if (o.endsWith(".index")) {
@@ -1492,7 +1494,7 @@ function yn(s) {
       partitionKeyLength: t.partitionKeyLength,
       parts: r
     };
-  } else if (ce(s.resourceType, mn)) {
+  } else if (le(s.resourceType, vn)) {
     const t = e, r = {};
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
@@ -1522,7 +1524,7 @@ function yn(s) {
   }
   throw new Error(`unsupported resource type: ${Js(s.resourceType)}`);
 }
-function wn(s, e) {
+function Sn(s, e) {
   const t = s.axesSpec.length, r = {};
   for (const { key: o, val: n } of e) {
     if (o.length !== t)
@@ -1535,14 +1537,14 @@ function wn(s, e) {
     data: r
   };
 }
-function Sn(s, e) {
+function bn(s, e) {
   const t = Ne("sha256");
-  return t.update(re(s)), t.update(String(qe(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
+  return t.update(re(s)), t.update(String(ze(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
 }
 function cr(s, e) {
   return re({ __isRef: !0, blockId: s, name: e });
 }
-function bn(s, e) {
+function Rn(s, e) {
   return re({ resolvePath: s, name: e });
 }
 function os(s, e = !0, t = !1, r = "") {
@@ -1584,7 +1586,7 @@ function os(s, e = !0, t = !1, r = "") {
     for (const [, u] of n) u.data === void 0 && (u.hasData = !1);
   return { locked: i, results: n };
 }
-function Rn(s, e = !0, t = "", r) {
+function Cn(s, e = !0, t = "", r) {
   if (!s.getIsReadyOrError()) throw new Error("resource is not ready");
   const o = os(s, e, !1, t);
   Qs(o.locked);
@@ -1597,14 +1599,14 @@ function Rn(s, e = !0, t = "", r) {
     if (a === void 0) throw new Error(`no data for key ${i}`);
     if (!a.ok) throw new Hs(a.error);
     n[i] = {
-      id: r.length === 0 ? Sn(c.spec, a.value) : bn(r, i),
+      id: r.length === 0 ? bn(c.spec, a.value) : Rn(r, i),
       spec: c.spec,
       data: a.value
     };
   }
   return n;
 }
-class Lt {
+class Nt {
   constructor(e, t) {
     S(this, "allSpecsAvailable");
     this.ctx = e, this.blocks = t;
@@ -1676,7 +1678,7 @@ class Lt {
       if (a.spec !== void 0 && a.hasData === !0 && a.data !== void 0) {
         const l = a.data();
         l !== void 0 ? e.push({
-          ref: Ue(i, c),
+          ref: Je(i, c),
           obj: {
             id: l.ok ? cr(i, c) : void 0,
             spec: a.spec,
@@ -1712,7 +1714,7 @@ class Lt {
         i.staging.locked || o(`staging_not_locked:${n}`);
         for (const [a, l] of i.staging.results)
           l.spec !== void 0 && (e.push({
-            ref: Ue(n, a),
+            ref: Je(n, a),
             obj: l.spec
           }), c.add(a));
       } else o(`staging_not_rendered:${n}`);
@@ -1720,7 +1722,7 @@ class Lt {
         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: Ue(n, a),
+            ref: Je(n, a),
             obj: l.spec
           });
       }
@@ -1732,9 +1734,9 @@ class Lt {
     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), ks(e, a.spec) && t.push({
+          o.has(c) || a.spec === void 0 || (o.add(c), Ps(e, a.spec) && t.push({
             label: r.info.label + " / " + c,
-            ref: Ue(r.info.id, c),
+            ref: Je(r.info.id, c),
             spec: a.spec
           }));
       };
@@ -1743,8 +1745,8 @@ class Lt {
     return t;
   }
   static create(e, t, r) {
-    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(pe)), c = Et(n).traverseIds("upstream", r), a = /* @__PURE__ */ new Map();
-    for (const l of te(n)) {
+    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(pe)), c = Pt(n).traverseIds("upstream", r), a = /* @__PURE__ */ new Map();
+    for (const l of se(n)) {
       if (!c.has(l.id)) continue;
       const u = lr(
         o.traverse({
@@ -1769,7 +1771,7 @@ class Lt {
       );
       a.set(l.id, { info: l, prod: u, staging: d });
     }
-    return new Lt(e, a);
+    return new Nt(e, a);
   }
 }
 function lr(s, e) {
@@ -1777,7 +1779,7 @@ function lr(s, e) {
     return s ? { locked: !1, results: /* @__PURE__ */ new Map() } : void 0;
   if (e.ok) return os(e.value, !1, !0);
 }
-function Nt(s, e) {
+function Dt(s, e) {
   return {
     blockId: e,
     args: (n) => B(
@@ -1793,17 +1795,17 @@ function Nt(s, e) {
         stableIfNotFound: !0
       })) == null ? void 0 : i.getDataAsString();
     },
-    uiState: (n) => n.accessor(s).node().getKeyValueAsString(wt(e)),
+    uiState: (n) => n.accessor(s).node().getKeyValueAsString(St(e)),
     blockMeta: (n) => {
       const i = n.accessor(s).node(), c = B(i.getKeyValueAsJson(pe)), a = /* @__PURE__ */ new Map();
-      for (const l of te(c)) a.set(l.id, l);
+      for (const l of se(c)) a.set(l.id, l);
       return a;
     }
   };
 }
 function ns(s, e) {
   return {
-    ...Nt(s, e),
+    ...Dt(s, e),
     prod: (t) => {
       var r;
       return (r = t.accessor(s).node({ ignoreError: !0 }).traverse({
@@ -1820,7 +1822,7 @@ function ns(s, e) {
       })) == null ? void 0 : o.persist();
       return r === void 0 && t.markUnstable("staging_not_rendered"), r;
     },
-    getResultsPool: (t) => Lt.create(t, s, e)
+    getResultsPool: (t) => Nt.create(t, s, e)
   };
 }
 function* W(s, e) {
@@ -1874,7 +1876,7 @@ function* W(s, e) {
       M(s);
   }
 }
-function Cn(s, e) {
+function En(s, e) {
   const t = {};
   for (const [r, o] of Object.entries(s)) t[r] = e(o);
   return t;
@@ -1882,7 +1884,7 @@ function Cn(s, e) {
 function Oe(s, e) {
   return s === void 0 ? void 0 : e(s);
 }
-function En(s) {
+function Pn(s) {
   switch (s.type) {
     case "GetImportProgress":
       return !0;
@@ -1891,34 +1893,34 @@ function En(s) {
   }
 }
 function kn(s) {
-  for (const e of W(s)) if (En(e)) return !0;
+  for (const e of W(s)) if (Pn(e)) return !0;
   return !1;
 }
-function Qe(s) {
+function Ze(s) {
   return {
     type: "ReturnResult",
     result: s
   };
 }
-function k(s) {
-  return () => Qe(s);
+function P(s) {
+  return () => Ze(s);
 }
-const Pn = (s) => {
+const On = (s) => {
   const e = {};
   for (const [t, r] of Object.entries(s)) e[t] = r;
-  return k(e);
-}, On = (s) => {
+  return P(e);
+}, $n = (s) => {
   const e = s.source;
-  if (e === void 0) return k(void 0);
+  if (e === void 0) return P(void 0);
   const t = [];
   for (const r of e)
     r instanceof Array ? t.push(...r) : t.push(r);
-  return k(t);
-}, $n = (s) => {
+  return P(t);
+}, Fn = (s) => {
   const e = s.source, t = s.field;
-  return e === void 0 || t === void 0 ? k(void 0) : ({ cCtx: r }) => {
+  return e === void 0 || t === void 0 ? P(void 0) : ({ cCtx: r }) => {
     var o;
-    return Qe((o = r.accessor(e).node().traverse(t)) == null ? void 0 : o.persist());
+    return Ze((o = r.accessor(e).node().traverse(t)) == null ? void 0 : o.persist());
   };
 };
 function is(s, e) {
@@ -1926,10 +1928,10 @@ function is(s, e) {
   for (let o = 0; o < r; o++) t[String(o)] = e(s[o]);
   return t;
 }
-function Fn(s, e) {
+function In(s, e) {
   return (t) => {
     const r = t.source;
-    return r === void 0 ? k(void 0) : () => ({
+    return r === void 0 ? P(void 0) : () => ({
       type: "ScheduleSubroutine",
       subroutine: as(r.length),
       args: is(r, (o) => $({ ...s, [e.itVar]: o }, e.mapping))
@@ -1940,13 +1942,13 @@ function as(s) {
   return (e) => {
     const t = [];
     for (let r = 0; r < s; r++) t.push(e[String(r)]);
-    return k(t);
+    return P(t);
   };
 }
-function In(s, e) {
+function An(s, e) {
   return (t) => {
     const r = t.source;
-    if (r === void 0) return k(void 0);
+    if (r === void 0) return P(void 0);
     const o = {};
     for (const [n, i] of Object.entries(r)) {
       const c = { ...s, [e.itVar]: i };
@@ -1954,41 +1956,41 @@ function In(s, e) {
     }
     return () => ({
       type: "ScheduleSubroutine",
-      subroutine: An,
+      subroutine: Tn,
       args: o
     });
   };
 }
-const An = (s) => k(s), Tn = (s) => {
+const Tn = (s) => P(s), Ln = (s) => {
   const e = s.arg;
-  return k(e === void 0 ? void 0 : e.length === 0);
-}, Ln = (s) => {
-  const e = s.operand;
-  return k(e === void 0 ? void 0 : !e);
+  return P(e === void 0 ? void 0 : e.length === 0);
 }, Nn = (s) => {
-  const e = s.operand1, t = s.operand2;
-  return k(e === void 0 || t === void 0 ? void 0 : e && t);
+  const e = s.operand;
+  return P(e === void 0 ? void 0 : !e);
 }, Dn = (s) => {
   const e = s.operand1, t = s.operand2;
-  return k(e === void 0 || t === void 0 ? void 0 : e || t);
+  return P(e === void 0 || t === void 0 ? void 0 : e && t);
 }, Bn = (s) => {
+  const e = s.operand1, t = s.operand2;
+  return P(e === void 0 || t === void 0 ? void 0 : e || t);
+}, jn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ cCtx: t }) => {
+  return e === void 0 ? P(void 0) : ({ cCtx: t }) => {
     var r;
-    return Qe((r = t.accessor(e).node()) == null ? void 0 : r.getDataAsJson());
+    return Ze((r = t.accessor(e).node()) == null ? void 0 : r.getDataAsJson());
   };
-}, jn = (s) => {
+}, xn = (s) => {
   const e = s.source, t = s.field;
-  return k(e === void 0 || t === void 0 ? void 0 : e[t]);
+  return P(e === void 0 || t === void 0 ? void 0 : e[t]);
 };
-function xn(s, e) {
+function Vn(s, e) {
   return (t) => {
     const r = t.source;
-    return r === void 0 ? k(void 0) : ({ cCtx: o }) => {
+    return r === void 0 ? P(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);
+        if (a === void 0) i[c] = P(void 0);
         else {
           const l = { ...s, [e.itVar]: a.persist() };
           i[c] = $(l, e.mapping);
@@ -1996,15 +1998,15 @@ function xn(s, e) {
       }
       return {
         type: "ScheduleSubroutine",
-        subroutine: Vn,
+        subroutine: Un,
         args: i
       };
     };
   };
 }
-const Vn = (s) => k(s), Un = (s) => {
+const Un = (s) => P(s), Jn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: U.make(
       (r) => t.blobDriver.getDownloadedBlob(r.accessor(e).node().resourceInfo),
@@ -2016,9 +2018,9 @@ const Vn = (s) => k(s), Un = (s) => {
       }
     )
   });
-}, Jn = (s) => {
+}, Gn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ cCtx: t, drivers: r }) => {
+  return e === void 0 ? P(void 0) : ({ cCtx: t, drivers: r }) => {
     const o = t.accessor(e).node().resourceInfo;
     return {
       type: "ScheduleComputable",
@@ -2027,9 +2029,9 @@ const Vn = (s) => k(s), Un = (s) => {
       })
     };
   };
-}, Gn = (s) => {
+}, Mn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: U.make(
       (r) => t.blobDriver.getDownloadedBlob(r.accessor(e).node().resourceInfo),
@@ -2043,45 +2045,45 @@ const Vn = (s) => k(s), Un = (s) => {
       }
     )
   });
-}, Mn = (s) => {
+}, _n = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: t.blobDriver.getDownloadedBlob(e)
   });
-}, _n = (s) => {
+}, Kn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: t.blobDriver.getOnDemandBlob(e)
   });
-}, Kn = (s) => (e) => {
+}, Hn = (s) => (e) => {
   const t = e.source;
-  return t === void 0 ? k(void 0) : ({ drivers: r }) => ({
+  return t === void 0 ? P(void 0) : ({ drivers: r }) => ({
     type: "ScheduleComputable",
     computable: r.blobToURLDriver.extractArchiveAndGetURL(t, s)
   });
-}, Hn = (s) => {
+}, Wn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: t.uploadDriver.getProgressId(e)
   });
-}, Wn = (s) => (e) => {
+}, qn = (s) => (e) => {
   const t = e.source;
-  return t === void 0 ? k(void 0) : ({ drivers: r }) => ({
+  return t === void 0 ? P(void 0) : ({ drivers: r }) => ({
     type: "ScheduleComputable",
     computable: r.logDriver.getLastLogs(t, s)
   });
-}, qn = (s) => (e) => {
+}, zn = (s) => (e) => {
   const t = e.source;
-  return t === void 0 ? k(void 0) : ({ drivers: r }) => ({
+  return t === void 0 ? P(void 0) : ({ drivers: r }) => ({
     type: "ScheduleComputable",
     computable: r.logDriver.getProgressLog(t, s)
   });
-}, zn = (s) => {
+}, Xn = (s) => {
   const e = s.source;
-  return e === void 0 ? k(void 0) : ({ drivers: t }) => ({
+  return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: t.logDriver.getLogHandle(e)
   });
@@ -2090,18 +2092,18 @@ function $(s, e) {
   switch (e.type) {
     case "GetFromCtx":
       const t = s[e.variable];
-      return typeof t == "function" ? (r) => Qe(t(r.cCtx)) : k(t);
+      return typeof t == "function" ? (r) => Ze(t(r.cCtx)) : P(t);
     case "Isolate":
       return ({ drivers: r }) => ({
         type: "ScheduleComputable",
         computable: us(r, s, e.cfg)
       });
     case "Immediate":
-      return k(e.value);
+      return P(e.value);
     case "GetJsonField":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: jn,
+        subroutine: xn,
         args: {
           source: $(s, e.source),
           field: $(s, e.field)
@@ -2110,7 +2112,7 @@ function $(s, e) {
     case "MapArrayValues":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Fn(s, e),
+        subroutine: In(s, e),
         args: {
           source: $(s, e.source)
         }
@@ -2118,7 +2120,7 @@ function $(s, e) {
     case "MapRecordValues":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: In(s, e),
+        subroutine: An(s, e),
         args: {
           source: $(s, e.source)
         }
@@ -2126,8 +2128,8 @@ function $(s, e) {
     case "MakeObject":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Pn,
-        args: Cn(e.template, (r) => $(s, r))
+        subroutine: On,
+        args: En(e.template, (r) => $(s, r))
       });
     case "MakeArray":
       return () => ({
@@ -2138,7 +2140,7 @@ function $(s, e) {
     case "Flatten":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: On,
+        subroutine: $n,
         args: {
           source: $(s, e.source)
         }
@@ -2146,7 +2148,7 @@ function $(s, e) {
     case "IsEmpty":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Tn,
+        subroutine: Ln,
         args: {
           arg: $(s, e.arg)
         }
@@ -2154,7 +2156,7 @@ function $(s, e) {
     case "Not":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Ln,
+        subroutine: Nn,
         args: {
           operand: $(s, e.operand)
         }
@@ -2162,7 +2164,7 @@ function $(s, e) {
     case "And":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Nn,
+        subroutine: Dn,
         args: {
           operand1: $(s, e.operand1),
           operand2: $(s, e.operand2)
@@ -2171,7 +2173,7 @@ function $(s, e) {
     case "Or":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Dn,
+        subroutine: Bn,
         args: {
           operand1: $(s, e.operand1),
           operand2: $(s, e.operand2)
@@ -2180,7 +2182,7 @@ function $(s, e) {
     case "MapResourceFields":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: xn(s, e),
+        subroutine: Vn(s, e),
         args: {
           source: $(s, e.source)
         }
@@ -2188,7 +2190,7 @@ function $(s, e) {
     case "GetResourceField":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: $n,
+        subroutine: Fn,
         args: {
           source: $(s, e.source),
           field: $(s, e.field)
@@ -2197,7 +2199,7 @@ function $(s, e) {
     case "GetResourceValueAsJson":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Bn,
+        subroutine: jn,
         args: {
           source: $(s, e.source)
         }
@@ -2205,7 +2207,7 @@ function $(s, e) {
     case "GetBlobContent":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Un,
+        subroutine: Jn,
         args: {
           source: $(s, e.source)
         }
@@ -2213,7 +2215,7 @@ function $(s, e) {
     case "GetBlobContentAsString":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Jn,
+        subroutine: Gn,
         args: {
           source: $(s, e.source)
         }
@@ -2221,7 +2223,7 @@ function $(s, e) {
     case "GetBlobContentAsJson":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Gn,
+        subroutine: Mn,
         args: {
           source: $(s, e.source)
         }
@@ -2229,7 +2231,7 @@ function $(s, e) {
     case "GetDownloadedBlobContent":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Mn,
+        subroutine: _n,
         args: {
           source: $(s, e.source)
         }
@@ -2237,7 +2239,7 @@ function $(s, e) {
     case "GetOnDemandBlobContent":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: _n,
+        subroutine: Kn,
         args: {
           source: $(s, e.source)
         }
@@ -2245,7 +2247,7 @@ function $(s, e) {
     case "ExtractArchiveAndGetURL":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Kn(e.format),
+        subroutine: Hn(e.format),
         args: {
           source: $(s, e.source)
         }
@@ -2253,7 +2255,7 @@ function $(s, e) {
     case "GetImportProgress":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Hn,
+        subroutine: Wn,
         args: {
           source: $(s, e.source)
         }
@@ -2261,7 +2263,7 @@ function $(s, e) {
     case "GetLastLogs":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Wn(e.lines),
+        subroutine: qn(e.lines),
         args: {
           source: $(s, e.source)
         }
@@ -2269,7 +2271,7 @@ function $(s, e) {
     case "GetProgressLog":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: qn(e.patternToSearch),
+        subroutine: zn(e.patternToSearch),
         args: {
           source: $(s, e.source)
         }
@@ -2277,7 +2279,7 @@ function $(s, e) {
     case "GetLogHandle":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: zn,
+        subroutine: Xn,
         args: {
           source: $(s, e.source)
         }
@@ -2286,8 +2288,8 @@ function $(s, e) {
       return M(e);
   }
 }
-const Xn = ["$prod", "$staging"];
-function Yn(s) {
+const Yn = ["$prod", "$staging"];
+function Qn(s) {
   return {
     $blockId: s.blockId,
     $args: (e) => JSON.parse(s.args(e)),
@@ -2299,16 +2301,16 @@ function Yn(s) {
     $staging: s.staging
   };
 }
-const cs = Symbol(), ls = "return", Qn = { op: cs, arg: ls };
-function Zn(s) {
+const cs = Symbol(), ls = "return", Zn = { op: cs, arg: ls };
+function ei(s) {
   return s.op == cs && s.arg == ls;
 }
-function ei() {
+function ti() {
   return { pendingSubroutines: /* @__PURE__ */ new Map() };
 }
 function ur(s, e, t, r) {
   const o = new Mr(t), n = (c, a) => {
-    if (Zn(c))
+    if (ei(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");
@@ -2358,26 +2360,26 @@ function ur(s, e, t, r) {
   }
   return i;
 }
-function ti(s, e, t, r = {}) {
-  return us(s, Yn(e), t, r);
+function ri(s, e, t, r = {}) {
+  return us(s, Qn(e), t, r);
 }
 function us(s, e, t, r = {}) {
   const o = `${e.blockId}#` + re({
     ctx: Object.fromEntries(
-      Object.entries(e).filter(([n]) => Xn.indexOf(n) === -1)
+      Object.entries(e).filter(([n]) => Yn.indexOf(n) === -1)
     ),
     cfg: t
   });
   return U.makeRaw(
     (n) => {
-      const i = { drivers: s, cCtx: n }, c = ei();
+      const i = { drivers: s, cCtx: n }, c = ti();
       return {
         ir: ur(
           i,
           c,
           [
             {
-              destination: Qn,
+              destination: Zn,
               operation: $(e, t)
             }
           ],
@@ -2386,7 +2388,7 @@ function us(s, e, t, r = {}) {
         async postprocessValue(l) {
           const u = [];
           for (const g of l)
-            u.push({ destination: g.destination, operation: k(g.computable) });
+            u.push({ destination: g.destination, operation: P(g.computable) });
           const d = {
             drivers: s,
             get cCtx() {
@@ -2408,13 +2410,13 @@ function us(s, e, t, r = {}) {
     { ...r, key: o }
   );
 }
-function ri(s) {
+function si(s) {
   return s instanceof ArrayBuffer || ArrayBuffer.isView(s);
 }
 function dr(s) {
   return s !== void 0 ? Buffer.from(s).toString("base64") : void 0;
 }
-class Ye {
+class Qe {
   constructor(e, t, r, o, n) {
     S(this, "callbackRegistry");
     S(this, "fnJSONStringify");
@@ -2446,12 +2448,12 @@ class Ye {
     try {
       this.vm.unwrapResult(this.vm.evalCode(e, "bundle.js", { type: "global" })).dispose();
     } catch (t) {
-      throw Ye.cleanErrorContext(t), t;
+      throw Qe.cleanErrorContext(t), t;
     }
   }
   runCallback(e, ...t) {
     try {
-      return yt.withScope((r) => {
+      return wt.withScope((r) => {
         const o = r.manage(this.vm.getProp(this.callbackRegistry, e));
         if (this.vm.typeof(o) !== "function")
           throw new Error(`No such callback: ${e}`);
@@ -2466,7 +2468,7 @@ class Ye {
         );
       });
     } catch (r) {
-      throw Ye.cleanErrorContext(r), r;
+      throw Qe.cleanErrorContext(r), r;
     }
   }
   //
@@ -2538,9 +2540,9 @@ class Ye {
   parsePObjectCollection(e, t, r, ...o) {
     const n = this.getAccessor(e);
     if (!n.getIsReadyOrError()) return;
-    const i = Rn(n, t, r, o), c = {};
+    const i = Cn(n, t, r, o), c = {};
     for (const [a, l] of Object.entries(i))
-      c[a] = le(l, (u) => this.wrapAccessor(u));
+      c[a] = ue(l, (u) => this.wrapAccessor(u));
     return c;
   }
   //
@@ -2666,7 +2668,7 @@ class Ye {
       isComplete: e.isComplete,
       entries: e.entries.map((t) => ({
         ref: t.ref,
-        obj: le(t.obj, (r) => this.wrapAccessor(r))
+        obj: ue(t.obj, (r) => this.wrapAccessor(r))
       }))
     };
   }
@@ -2692,7 +2694,7 @@ class Ye {
     return this.resultPool.getSpecByRef(e, t);
   }
   getDataFromResultPoolByRef(e, t) {
-    return le(
+    return ue(
       this.resultPool.getDataByRef(e, t),
       (r) => this.wrapAccessor(r)
     );
@@ -2706,7 +2708,7 @@ class Ye {
         "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) => ue(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)),
       this.computableCtx
     );
   }
@@ -2716,9 +2718,9 @@ class Ye {
         "can't instantiate PTable from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPTable(
-      gt(
+      mt(
         e,
-        (t) => le(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
+        (t) => ue(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
       ),
       this.computableCtx
     );
@@ -2772,7 +2774,7 @@ class Ye {
           r = this.vm.null;
           break;
         }
-        if (ri(e)) {
+        if (si(e)) {
           r = this.vm.newArrayBuffer(e), o = !0;
           break;
         }
@@ -2808,12 +2810,12 @@ class Ye {
       return JSON.parse(t);
   }
   injectCtx() {
-    yt.withScope((e) => {
+    wt.withScope((e) => {
       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(Ps.GlobalCfgRenderCtxFeatureFlags, e)
+        this.exportObjectUniversal(ks.GlobalCfgRenderCtxFeatureFlags, e)
       );
       const i = (c, a) => {
         this.vm.newFunction(c, a).consume((l) => this.vm.setProp(t, c, l));
@@ -2895,7 +2897,7 @@ class Ye {
     });
   }
 }
-function Ze(s, e) {
+function et(s, e) {
   return Oe(
     s.traverse(
       {
@@ -2911,54 +2913,54 @@ function Ze(s, e) {
     }
   );
 }
-const Ge = process.env.MI_LOG_OUTPUT_STATUS;
-function si(s, e, t, r, o, n = {}) {
+const Me = process.env.MI_LOG_OUTPUT_STATUS;
+function oi(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"), U.makeRaw((c) => {
-    const a = new yt();
+    const a = new wt();
     c.addOnDestroy(() => a.dispose());
     const l = a.manage(s.quickJs.newRuntime());
     l.setMemoryLimit(1024 * 640), l.setMaxStackSize(1024 * 320);
-    const u = a.manage(l.newContext()), d = new Ye(a, u, e, s, c);
+    const u = a.manage(l.newContext()), d = new Qe(a, u, e, s, c);
     d.evaluateBundle(r.content);
     const f = d.runCallback(t.handle);
     d.resetComputableCtx();
     let h = 0;
-    return Ge && Ge !== "unstable-only" && console.log(`Output ${t.handle} scaffold calculated.`), {
+    return Me && Me !== "unstable-only" && console.log(`Output ${t.handle} scaffold calculated.`), {
       ir: d.computablesToResolve,
       postprocessValue: async (g, { unstableMarker: C, stable: I }) => {
-        for (const [K, P] of Object.entries(g)) d.runCallback(K, P);
+        for (const [K, k] of Object.entries(g)) d.runCallback(K, k);
         const N = d.importObjectUniversal(f);
-        return h++, Ge && (Ge !== "unstable-only" || !I) && console.log(
+        return h++, Me && (Me !== "unstable-only" || !I) && console.log(
           I ? `Stable output ${t.handle} calculated ${N !== void 0 ? "defined" : "undefined"}; (#${h})` : `Unstable output ${t.handle}; marker = ${C}; ${N !== void 0 ? "defined" : "undefined"} (#${h})`
         ), N;
       }
     };
   }, n);
 }
-function oi(s) {
+function ni(s) {
   return xr(s) ? s.isActive === !0 : kn(s);
 }
 function $e(s, e, t, r, o, n = {}) {
   if (xr(t)) {
     if (r === void 0) throw new Error("No code bundle.");
-    return si(s, e, t, r, o, n);
-  } else return ti(s.driverKit, e, t, n);
+    return oi(s, e, t, r, o, n);
+  } else return ri(s.driverKit, e, t, n);
 }
-function ni(s, e, t) {
+function ii(s, e, t) {
   return U.make(
     (r) => {
-      var g, C, I, N, K, P, se, he;
-      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(At)), i = B(o.getKeyValueAsJson(Ae)), c = B(o.getKeyValueAsJson(Te)), a = B(o.getKeyValueAsJson(pe)), l = B(
-        o.getKeyValueAsJson(ze)
+      var g, C, I, N, K, k, oe, he;
+      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(Tt)), i = B(o.getKeyValueAsJson(Ae)), c = B(o.getKeyValueAsJson(Te)), a = B(o.getKeyValueAsJson(pe)), l = B(
+        o.getKeyValueAsJson(Xe)
       ), u = /* @__PURE__ */ new Map();
-      for (const { id: T } of te(a)) {
+      for (const { id: T } of se(a)) {
         const q = o.traverse({
           field: V(T, "currentArgs"),
           assertFieldType: "Dynamic",
           errorIfFieldNotSet: !0
         });
-        let oe;
+        let ne;
         const H = o.traverse({
           field: V(T, "prodArgs"),
           assertFieldType: "Dynamic",
@@ -2974,28 +2976,28 @@ function ni(s, e, t) {
             assertFieldType: "Dynamic",
             errorIfFieldNotFound: !0
           });
-          oe = {
+          ne = {
             arguments: H.getDataAsJson(),
             stale: q.id !== H.id,
             outputError: J.error !== void 0 || x.error !== void 0 || ((g = J.value) == null ? void 0 : g.getError()) !== void 0 || ((C = x.value) == null ? void 0 : C.getError()) !== void 0,
             outputsError: ((I = J.error) == null ? void 0 : I.getDataAsString()) ?? ((K = (N = J.value) == null ? void 0 : N.getError()) == null ? void 0 : K.getDataAsString()),
-            exportsError: ((P = x.error) == null ? void 0 : P.getDataAsString()) ?? ((he = (se = x.value) == null ? void 0 : se.getError()) == null ? void 0 : he.getDataAsString()),
+            exportsError: ((k = x.error) == null ? void 0 : k.getDataAsString()) ?? ((he = (oe = x.value) == null ? void 0 : oe.getError()) == null ? void 0 : he.getDataAsString()),
             finished: (J.value !== void 0 && J.value.getIsReadyOrError() || J.error !== void 0 && J.error.getIsReadyOrError()) && (x.value !== void 0 && x.value.getIsReadyOrError() || x.error !== void 0 && x.error.getIsReadyOrError())
           };
         }
-        u.set(T, { currentArguments: q.getDataAsJson(), prod: oe });
+        u.set(T, { currentArguments: q.getDataAsJson(), prod: ne });
       }
-      const d = We(a, (T) => u.get(T).currentArguments), f = new Set(l.blocksInLimbo), h = [...te(a)].map(({ id: T, label: q, renderingMode: oe }) => {
+      const d = qe(a, (T) => u.get(T).currentArguments), f = new Set(l.blocksInLimbo), h = [...se(a)].map(({ id: T, label: q, renderingMode: ne }) => {
         var w, R, O, E, A;
         const H = B(u.get(T)), J = B(d.nodes.get(T));
         let x = "NotCalculated";
         H.prod !== void 0 && (f.has(T) ? x = "Limbo" : x = H.prod.finished ? "Done" : "Running");
-        const z = Ze(o, T), { sections: fe, title: v, inputsValid: p, sdkVersion: y } = Oe(z, ({ bpId: D, cfg: F, info: ge }) => {
-          const nt = Nt(s, T);
+        const z = et(o, T), { sections: fe, title: v, inputsValid: p, sdkVersion: y } = Oe(z, ({ bpId: D, cfg: F, info: ge }) => {
+          const it = Dt(s, T);
           return {
             sections: $e(
               t,
-              nt,
+              it,
               F.sections,
               F.code,
               D
@@ -3004,7 +3006,7 @@ function ni(s, e, t) {
               F.title,
               (Rs) => $e(
                 t,
-                nt,
+                it,
                 Rs,
                 F.code,
                 D
@@ -3012,7 +3014,7 @@ function ni(s, e, t) {
             ),
             inputsValid: $e(
               t,
-              nt,
+              it,
               F.inputsValid,
               F.code,
               D
@@ -3031,7 +3033,7 @@ function ni(s, e, t) {
           id: T,
           label: v ?? q,
           title: v ?? q,
-          renderingMode: oe,
+          renderingMode: ne,
           stale: ((w = H.prod) == null ? void 0 : w.stale) !== !1 || x === "Limbo",
           missingReference: J.missingReferences,
           upstreams: [...d.traverseIdsExcludingRoots("upstream", T)],
@@ -3054,7 +3056,7 @@ function ni(s, e, t) {
         meta: c,
         created: new Date(n),
         lastModified: new Date(i),
-        authorMarker: o.getKeyValueAsJson(bt),
+        authorMarker: o.getKeyValueAsJson(Rt),
         blocks: h
       };
     },
@@ -3080,13 +3082,13 @@ function ni(s, e, t) {
     }
   ).withStableType();
 }
-function ii(s, e) {
+function ai(s, e) {
   const t = s.node();
-  if (ce(t.resourceType, Qr)) {
+  if (le(t.resourceType, Qr)) {
     const r = t.getDataAsJson();
     if (r === void 0) throw new Error("No resource data.");
     return e.frontendDownloadDriver.getPath(new URL(r.url)).withStableType();
-  } else if (ce(t.resourceType, Zr)) {
+  } else if (le(t.resourceType, Zr)) {
     const r = t.getDataAsJson();
     if (r === void 0) throw new Error("No resource data.");
     return e.signer.verify(
@@ -3097,10 +3099,10 @@ function ii(s, e) {
   } else
     throw new Error(`Unsupported resource type: ${JSON.stringify(t.resourceType)}`);
 }
-function ai(s, e) {
+function ci(s, e) {
   if (s !== void 0)
     return U.make(
-      (t) => ii(t.accessor(s), e),
+      (t) => ai(t.accessor(s), e),
       {
         postprocessValue: (t) => {
           if (t !== void 0) {
@@ -3112,11 +3114,11 @@ function ai(s, e) {
       }
     ).withStableType();
 }
-function ci(s, e, t) {
+function li(s, e, t) {
   return U.make(
     (r) => {
       var c;
-      const o = r.accessor(s).node(), n = Ze(o, e), i = (c = o.traverse(
+      const o = r.accessor(s).node(), n = et(o, e), i = (c = o.traverse(
         {
           field: V(e, "blockPack"),
           assertFieldType: "Dynamic"
@@ -3125,7 +3127,7 @@ function ci(s, e, t) {
         { field: ts, assertFieldType: "Input" }
       )) == null ? void 0 : c.persist();
       return {
-        path: ai(i, t),
+        path: ci(i, t),
         sdkVersion: n == null ? void 0 : n.cfg.sdkVersion
       };
     },
@@ -3137,18 +3139,18 @@ function ds(s, e, t) {
     return U.make((i) => ds(s, e, i), {
       key: `inputs#${Jr(s.rid)}#${e}`
     });
-  const r = t.accessor(s).node(), o = Nt(s, e), n = o.uiState(t);
+  const r = t.accessor(s).node(), o = Dt(s, e), n = o.uiState(t);
   return {
-    author: r.getKeyValueAsJson(St(e)),
+    author: r.getKeyValueAsJson(bt(e)),
     args: JSON.parse(o.args(t)),
     ui: n !== void 0 ? JSON.parse(n) : void 0
   };
 }
-function li(s, e, t) {
+function ui(s, e, t) {
   return U.make(
     (r) => {
       const o = r.accessor(s).node(), n = ns(s, e);
-      return Oe(Ze(o, e), ({ cfg: i, bpId: c }) => {
+      return Oe(et(o, e), ({ cfg: i, bpId: c }) => {
         const a = {};
         for (const [l, u] of Object.entries(i.outputs)) {
           const d = $e(t, n, u, i.code, c);
@@ -3160,13 +3162,13 @@ function li(s, e, t) {
     { key: "outputs#" + Jr(s.rid) + "#" + e }
   ).withStableType();
 }
-function ui(s, e) {
+function di(s, e) {
   return U.make((t) => {
     const r = t.accessor(s).node(), o = B(r.getKeyValueAsJson(pe)), n = [];
-    for (const { id: i, renderingMode: c } of te(o)) {
-      const a = Ze(r, i);
+    for (const { id: i, renderingMode: c } of se(o)) {
+      const a = et(r, i);
       if (a === void 0) continue;
-      const l = Object.entries(a.cfg.outputs).map(([, d]) => d).filter((d) => oi(d)).map((d) => d);
+      const l = Object.entries(a.cfg.outputs).map(([, d]) => d).filter((d) => ni(d)).map((d) => d);
       if (l.length === 0) continue;
       const u = ns(r.persist(), i);
       for (const d of l)
@@ -3177,21 +3179,21 @@ function ui(s, e) {
     return n;
   });
 }
-class di {
+class pi {
   constructor() {
     S(this, "states", /* @__PURE__ */ new Map());
   }
   setState(e, t) {
     const r = this.states.get(e);
     if (r === void 0) {
-      this.states.set(e, { state: t, change: new Xt() });
+      this.states.set(e, { state: t, change: new Yt() });
       return;
     }
     r.state = { ...t }, r.change.markChanged();
   }
   readState(e, t) {
     let r = this.states.get(t);
-    return r === void 0 && (r = { state: { ...Os }, change: new Xt() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
+    return r === void 0 && (r = { state: { ...Os }, change: new Yt() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
   }
   getState(e) {
     return U.make(
@@ -3204,29 +3206,29 @@ class di {
     t !== void 0 && (this.states.delete(e), t.change.markChanged());
   }
 }
-class Dt {
+class Bt {
   constructor(e, t, r) {
     /** Underlying pl resource id */
     S(this, "rid");
     /** Data for the left panel, contain basic information about block status. */
     S(this, "overview");
-    S(this, "navigationStates", new di());
+    S(this, "navigationStates", new pi());
     S(this, "blockComputables", /* @__PURE__ */ new Map());
     S(this, "blockFrontends", /* @__PURE__ */ new Map());
     S(this, "activeConfigs");
     S(this, "refreshLoopResult");
     S(this, "abortController", new AbortController());
     S(this, "destroyed", !1);
-    this.env = e, this.projectTree = r, this.overview = ni(
+    this.env = e, this.projectTree = r, this.overview = ii(
       r.entry(),
       this.navigationStates,
       e
-    ).withPreCalculatedValueTree(), this.rid = t, this.refreshLoopResult = this.refreshLoop(), this.activeConfigs = ui(r.entry(), e);
+    ).withPreCalculatedValueTree(), this.rid = t, this.refreshLoopResult = this.refreshLoop(), this.activeConfigs = di(r.entry(), e);
   }
   async refreshLoop() {
     for (; !this.destroyed; )
       try {
-        await Je(this.env.pl, this.rid, (e) => {
+        await Ge(this.env.pl, this.rid, (e) => {
           e.doRefresh(this.env.ops.stagingRenderingRate);
         }), await this.activeConfigs.getValue(), await _r(this.env.ops.projectRefreshInterval, this.abortController.signal);
       } catch (e) {
@@ -3329,7 +3331,7 @@ class Dt {
    * stale state.
    * */
   async runBlock(e) {
-    await Je(this.env.pl, this.rid, (t) => t.renderProduction([e], !0)), await this.projectTree.refreshState();
+    await Ge(this.env.pl, this.rid, (t) => t.renderProduction([e], !0)), await this.projectTree.refreshState();
   }
   /**
    * Stops the block if it is running by destroying its production state. All
@@ -3337,7 +3339,7 @@ class Dt {
    * calculated.
    * */
   async stopBlock(e) {
-    await Je(this.env.pl, this.rid, (t) => t.stopProduction(e)), await this.projectTree.refreshState();
+    await Ge(this.env.pl, this.rid, (t) => t.stopProduction(e)), await this.projectTree.refreshState();
   }
   // /** Update block label. */
   // public async setBlockLabel(blockId: string, label: string, author?: AuthorMarker) {
@@ -3400,9 +3402,9 @@ class Dt {
   /** Resets arguments and ui state of the block to initial state */
   async resetBlockArgsAndUiState(e, t) {
     await this.env.pl.withWriteTx("BlockInputsReset", async (r) => {
-      const o = vt(
+      const o = yt(
         (await r.getField(j(this.rid, V(e, "blockPack")))).value
-      ), n = vt(
+      ), n = yt(
         (await r.getField(j(o, L.HolderRefField))).value
       ), i = await r.getResourceData(n, !1), c = JSON.parse(
         Buffer.from(B(i.data)).toString("utf-8")
@@ -3415,7 +3417,7 @@ class Dt {
   getBlockComputables(e) {
     const t = this.blockComputables.get(e);
     if (t === void 0) {
-      const r = li(this.projectTree.entry(), e, this.env), n = {
+      const r = ui(this.projectTree.entry(), e, this.env), n = {
         fullState: U.make(
           (i) => ({
             argsAndUiState: ds(this.projectTree.entry(), e, i),
@@ -3449,7 +3451,7 @@ class Dt {
   getBlockFrontend(e) {
     const t = this.blockFrontends.get(e);
     if (t === void 0) {
-      const r = ci(
+      const r = li(
         this.projectTree.entry(),
         e,
         this.env
@@ -3469,21 +3471,21 @@ class Dt {
     await this.destroy();
   }
   static async init(e, t) {
-    await Je(e.pl, t, (o) => {
+    await Ge(e.pl, t, (o) => {
     });
     const r = await Gr.init(
       e.pl,
       t,
       {
         ...e.ops.defaultTreeOptions,
-        pruning: pi
+        pruning: hi
       },
       e.logger
     );
-    return new Dt(e, t, r);
+    return new Bt(e, t, r);
   }
 }
-function pi(s) {
+function hi(s) {
   switch (s.type.name) {
     case "BlockPackCustom":
       return s.fields.filter((e) => e.name !== "template");
@@ -3525,7 +3527,7 @@ function hs(s) {
     downloadBlobToURLPath: G.join(s, "downloadToURL")
   };
 }
-const hi = {
+const fi = {
   ...ps,
   defaultTreeOptions: {
     pollingInterval: 350,
@@ -3535,18 +3537,18 @@ const hi = {
   projectRefreshInterval: 700,
   stagingRenderingRate: 5
 };
-function fi(s) {
+function gi(s) {
   return {
     ...hs(s),
     frontendDownloadPath: G.join(s, "frontend")
   };
 }
-function gi(s) {
+function mi(s) {
   return s && s.__esModule && Object.prototype.hasOwnProperty.call(s, "default") ? s.default : s;
 }
-var Pt = { exports: {} };
-const mi = "2.0.0", fs = 256, vi = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
-9007199254740991, yi = 16, wi = fs - 6, Si = [
+var Ot = { exports: {} };
+const vi = "2.0.0", fs = 256, yi = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
+9007199254740991, wi = 16, Si = fs - 6, bi = [
   "major",
   "premajor",
   "minor",
@@ -3555,25 +3557,25 @@ const mi = "2.0.0", fs = 256, vi = Number.MAX_SAFE_INTEGER || /* istanbul ignore
   "prepatch",
   "prerelease"
 ];
-var et = {
+var tt = {
   MAX_LENGTH: fs,
-  MAX_SAFE_COMPONENT_LENGTH: yi,
-  MAX_SAFE_BUILD_LENGTH: wi,
-  MAX_SAFE_INTEGER: vi,
-  RELEASE_TYPES: Si,
-  SEMVER_SPEC_VERSION: mi,
+  MAX_SAFE_COMPONENT_LENGTH: wi,
+  MAX_SAFE_BUILD_LENGTH: Si,
+  MAX_SAFE_INTEGER: yi,
+  RELEASE_TYPES: bi,
+  SEMVER_SPEC_VERSION: vi,
   FLAG_INCLUDE_PRERELEASE: 1,
   FLAG_LOOSE: 2
 };
-const bi = typeof process == "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...s) => console.error("SEMVER", ...s) : () => {
+const Ri = typeof process == "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...s) => console.error("SEMVER", ...s) : () => {
 };
-var tt = bi;
+var rt = Ri;
 (function(s, e) {
   const {
     MAX_SAFE_COMPONENT_LENGTH: t,
     MAX_SAFE_BUILD_LENGTH: r,
     MAX_LENGTH: o
-  } = et, n = tt;
+  } = tt, n = rt;
   e = s.exports = {};
   const i = e.re = [], c = e.safeRe = [], a = e.src = [], l = e.t = {};
   let u = 0;
@@ -3586,14 +3588,14 @@ var tt = bi;
       C = C.split(`${I}*`).join(`${I}{0,${N}}`).split(`${I}+`).join(`${I}{1,${N}}`);
     return C;
   }, g = (C, I, N) => {
-    const K = h(I), P = u++;
-    n(C, P, I), l[C] = P, a[P] = I, i[P] = new RegExp(I, N ? "g" : void 0), c[P] = new RegExp(K, N ? "g" : void 0);
+    const K = h(I), k = u++;
+    n(C, k, I), l[C] = k, a[k] = I, i[k] = new RegExp(I, N ? "g" : void 0), c[k] = new RegExp(K, 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*$");
-})(Pt, Pt.exports);
-var De = Pt.exports;
-const Ri = Object.freeze({ loose: !0 }), Ci = Object.freeze({}), Ei = (s) => s ? typeof s != "object" ? Ri : s : Ci;
-var Bt = Ei;
+})(Ot, Ot.exports);
+var De = Ot.exports;
+const Ci = Object.freeze({ loose: !0 }), Ei = Object.freeze({}), Pi = (s) => s ? typeof s != "object" ? Ci : s : Ei;
+var jt = Pi;
 const pr = /^[0-9]+$/, gs = (s, e) => {
   const t = pr.test(s), r = pr.test(e);
   return t && r && (s = +s, e = +e), s === e ? 0 : t && !r ? -1 : r && !t ? 1 : s < e ? -1 : 1;
@@ -3602,10 +3604,10 @@ var ms = {
   compareIdentifiers: gs,
   rcompareIdentifiers: ki
 };
-const Me = tt, { MAX_LENGTH: hr, MAX_SAFE_INTEGER: _e } = et, { safeRe: fr, t: gr } = De, Pi = Bt, { compareIdentifiers: me } = ms;
-let Oi = class ee {
+const _e = rt, { MAX_LENGTH: hr, MAX_SAFE_INTEGER: Ke } = tt, { safeRe: fr, t: gr } = De, Oi = jt, { compareIdentifiers: me } = ms;
+let $i = class ee {
   constructor(e, t) {
-    if (t = Pi(t), e instanceof ee) {
+    if (t = Oi(t), e instanceof ee) {
       if (e.loose === !!t.loose && e.includePrerelease === !!t.includePrerelease)
         return e;
       e = e.version;
@@ -3615,20 +3617,20 @@ let Oi = class ee {
       throw new TypeError(
         `version is longer than ${hr} characters`
       );
-    Me("SemVer", e, t), this.options = t, this.loose = !!t.loose, this.includePrerelease = !!t.includePrerelease;
+    _e("SemVer", e, t), this.options = t, this.loose = !!t.loose, this.includePrerelease = !!t.includePrerelease;
     const r = e.trim().match(t.loose ? fr[gr.LOOSE] : fr[gr.FULL]);
     if (!r)
       throw new TypeError(`Invalid Version: ${e}`);
-    if (this.raw = e, this.major = +r[1], this.minor = +r[2], this.patch = +r[3], this.major > _e || this.major < 0)
+    if (this.raw = e, this.major = +r[1], this.minor = +r[2], this.patch = +r[3], this.major > Ke || this.major < 0)
       throw new TypeError("Invalid major version");
-    if (this.minor > _e || this.minor < 0)
+    if (this.minor > Ke || this.minor < 0)
       throw new TypeError("Invalid minor version");
-    if (this.patch > _e || this.patch < 0)
+    if (this.patch > Ke || this.patch < 0)
       throw new TypeError("Invalid patch version");
     r[4] ? this.prerelease = r[4].split(".").map((o) => {
       if (/^[0-9]+$/.test(o)) {
         const n = +o;
-        if (n >= 0 && n < _e)
+        if (n >= 0 && n < Ke)
           return n;
       }
       return o;
@@ -3641,7 +3643,7 @@ let Oi = class ee {
     return this.version;
   }
   compare(e) {
-    if (Me("SemVer.compare", this.version, this.options, e), !(e instanceof ee)) {
+    if (_e("SemVer.compare", this.version, this.options, e), !(e instanceof ee)) {
       if (typeof e == "string" && e === this.version)
         return 0;
       e = new ee(e, this.options);
@@ -3661,7 +3663,7 @@ let Oi = class ee {
     let t = 0;
     do {
       const r = this.prerelease[t], o = e.prerelease[t];
-      if (Me("prerelease compare", t, r, o), r === void 0 && o === void 0)
+      if (_e("prerelease compare", t, r, o), r === void 0 && o === void 0)
         return 0;
       if (o === void 0)
         return 1;
@@ -3677,7 +3679,7 @@ let Oi = class ee {
     let t = 0;
     do {
       const r = this.build[t], o = e.build[t];
-      if (Me("build compare", t, r, o), r === void 0 && o === void 0)
+      if (_e("build compare", t, r, o), r === void 0 && o === void 0)
         return 0;
       if (o === void 0)
         return 1;
@@ -3741,8 +3743,8 @@ let Oi = class ee {
     return this.raw = this.format(), this.build.length && (this.raw += `+${this.build.join(".")}`), this;
   }
 };
-var _ = Oi;
-const mr = _, $i = (s, e, t = !1) => {
+var _ = $i;
+const mr = _, Fi = (s, e, t = !1) => {
   if (s instanceof mr)
     return s;
   try {
@@ -3753,18 +3755,18 @@ const mr = _, $i = (s, e, t = !1) => {
     throw r;
   }
 };
-var Se = $i;
-const Fi = Se, Ii = (s, e) => {
-  const t = Fi(s, e);
+var Se = Fi;
+const Ii = Se, Ai = (s, e) => {
+  const t = Ii(s, e);
   return t ? t.version : null;
 };
-var Ai = Ii;
-const Ti = Se, Li = (s, e) => {
-  const t = Ti(s.trim().replace(/^[=v]+/, ""), e);
+var Ti = Ai;
+const Li = Se, Ni = (s, e) => {
+  const t = Li(s.trim().replace(/^[=v]+/, ""), e);
   return t ? t.version : null;
 };
-var Ni = Li;
-const vr = _, Di = (s, e, t, r, o) => {
+var Di = Ni;
+const vr = _, Bi = (s, e, t, r, o) => {
   typeof t == "string" && (o = r, r = t, t = void 0);
   try {
     return new vr(
@@ -3775,8 +3777,8 @@ const vr = _, Di = (s, e, t, r, o) => {
     return null;
   }
 };
-var Bi = Di;
-const yr = Se, ji = (s, e) => {
+var ji = Bi;
+const yr = Se, xi = (s, e) => {
   const t = yr(s, null, !0), r = yr(e, null, !0), o = t.compare(r);
   if (o === 0)
     return null;
@@ -3786,46 +3788,46 @@ const yr = Se, ji = (s, e) => {
   const u = a ? "pre" : "";
   return t.major !== r.major ? u + "major" : t.minor !== r.minor ? u + "minor" : t.patch !== r.patch ? u + "patch" : "prerelease";
 };
-var xi = ji;
-const Vi = _, Ui = (s, e) => new Vi(s, e).major;
-var Ji = Ui;
-const Gi = _, Mi = (s, e) => new Gi(s, e).minor;
-var _i = Mi;
-const Ki = _, Hi = (s, e) => new Ki(s, e).patch;
-var Wi = Hi;
-const qi = Se, zi = (s, e) => {
-  const t = qi(s, e);
+var Vi = xi;
+const Ui = _, Ji = (s, e) => new Ui(s, e).major;
+var Gi = Ji;
+const Mi = _, _i = (s, e) => new Mi(s, e).minor;
+var Ki = _i;
+const Hi = _, Wi = (s, e) => new Hi(s, e).patch;
+var qi = Wi;
+const zi = Se, Xi = (s, e) => {
+  const t = zi(s, e);
   return t && t.prerelease.length ? t.prerelease : null;
 };
-var Xi = zi;
-const wr = _, Yi = (s, e, t) => new wr(s, t).compare(new wr(e, t));
-var Q = Yi;
-const Qi = Q, Zi = (s, e, t) => Qi(e, s, t);
-var ea = Zi;
-const ta = Q, ra = (s, e) => ta(s, e, !0);
-var sa = ra;
-const Sr = _, oa = (s, e, t) => {
+var Yi = Xi;
+const wr = _, Qi = (s, e, t) => new wr(s, t).compare(new wr(e, t));
+var Q = Qi;
+const Zi = Q, ea = (s, e, t) => Zi(e, s, t);
+var ta = ea;
+const ra = Q, sa = (s, e) => ra(s, e, !0);
+var oa = sa;
+const Sr = _, na = (s, e, t) => {
   const r = new Sr(s, t), o = new Sr(e, t);
   return r.compare(o) || r.compareBuild(o);
 };
-var jt = oa;
-const na = jt, ia = (s, e) => s.sort((t, r) => na(t, r, e));
-var aa = ia;
-const ca = jt, la = (s, e) => s.sort((t, r) => ca(r, t, e));
-var ua = la;
-const da = Q, pa = (s, e, t) => da(s, e, t) > 0;
-var rt = pa;
-const ha = Q, fa = (s, e, t) => ha(s, e, t) < 0;
-var xt = fa;
-const ga = Q, ma = (s, e, t) => ga(s, e, t) === 0;
-var vs = ma;
-const va = Q, ya = (s, e, t) => va(s, e, t) !== 0;
-var ys = ya;
-const wa = Q, Sa = (s, e, t) => wa(s, e, t) >= 0;
-var Vt = Sa;
-const ba = Q, Ra = (s, e, t) => ba(s, e, t) <= 0;
-var Ut = Ra;
-const Ca = vs, Ea = ys, ka = rt, Pa = Vt, Oa = xt, $a = Ut, Fa = (s, e, t, r) => {
+var xt = na;
+const ia = xt, aa = (s, e) => s.sort((t, r) => ia(t, r, e));
+var ca = aa;
+const la = xt, ua = (s, e) => s.sort((t, r) => la(r, t, e));
+var da = ua;
+const pa = Q, ha = (s, e, t) => pa(s, e, t) > 0;
+var st = ha;
+const fa = Q, ga = (s, e, t) => fa(s, e, t) < 0;
+var Vt = ga;
+const ma = Q, va = (s, e, t) => ma(s, e, t) === 0;
+var vs = va;
+const ya = Q, wa = (s, e, t) => ya(s, e, t) !== 0;
+var ys = wa;
+const Sa = Q, ba = (s, e, t) => Sa(s, e, t) >= 0;
+var Ut = ba;
+const Ra = Q, Ca = (s, e, t) => Ra(s, e, t) <= 0;
+var Jt = Ca;
+const Ea = vs, Pa = ys, ka = st, Oa = Ut, $a = Vt, Fa = Jt, Ia = (s, e, t, r) => {
   switch (e) {
     case "===":
       return typeof s == "object" && (s = s.version), typeof t == "object" && (t = t.version), s === t;
@@ -3834,33 +3836,33 @@ const Ca = vs, Ea = ys, ka = rt, Pa = Vt, Oa = xt, $a = Ut, Fa = (s, e, t, r) =>
     case "":
     case "=":
     case "==":
-      return Ca(s, t, r);
-    case "!=":
       return Ea(s, t, r);
+    case "!=":
+      return Pa(s, t, r);
     case ">":
       return ka(s, t, r);
     case ">=":
-      return Pa(s, t, r);
-    case "<":
       return Oa(s, t, r);
-    case "<=":
+    case "<":
       return $a(s, t, r);
+    case "<=":
+      return Fa(s, t, r);
     default:
       throw new TypeError(`Invalid operator: ${e}`);
   }
 };
-var ws = Fa;
-const Ia = _, Aa = Se, { safeRe: Ke, t: He } = De, Ta = (s, e) => {
-  if (s instanceof Ia)
+var ws = Ia;
+const Aa = _, Ta = Se, { safeRe: He, t: We } = De, La = (s, e) => {
+  if (s instanceof Aa)
     return s;
   if (typeof s == "number" && (s = String(s)), typeof s != "string")
     return null;
   e = e || {};
   let t = null;
   if (!e.rtl)
-    t = s.match(e.includePrerelease ? Ke[He.COERCEFULL] : Ke[He.COERCE]);
+    t = s.match(e.includePrerelease ? He[We.COERCEFULL] : He[We.COERCE]);
   else {
-    const a = e.includePrerelease ? Ke[He.COERCERTLFULL] : Ke[He.COERCERTL];
+    const a = e.includePrerelease ? He[We.COERCERTLFULL] : He[We.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;
@@ -3869,10 +3871,10 @@ const Ia = _, Aa = Se, { safeRe: Ke, t: He } = De, Ta = (s, e) => {
   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 Aa(`${r}.${o}.${n}${i}${c}`, e);
+  return Ta(`${r}.${o}.${n}${i}${c}`, e);
 };
-var La = Ta;
-class Na {
+var Na = La;
+class Da {
   constructor() {
     this.max = 1e3, this.map = /* @__PURE__ */ new Map();
   }
@@ -3895,9 +3897,9 @@ class Na {
     return this;
   }
 }
-var Da = Na, lt, br;
+var Ba = Da, ut, br;
 function Z() {
-  if (br) return lt;
+  if (br) return ut;
   br = 1;
   const s = /\s+/g;
   class e {
@@ -3979,26 +3981,26 @@ function Z() {
       return !1;
     }
   }
-  lt = e;
-  const t = Da, r = new t(), o = Bt, n = st(), i = tt, c = _, {
+  ut = e;
+  const t = Ba, r = new t(), o = jt, n = ot(), i = rt, c = _, {
     safeRe: a,
     t: l,
     comparatorTrimReplace: u,
     tildeTrimReplace: d,
     caretTrimReplace: f
-  } = De, { FLAG_INCLUDE_PRERELEASE: h, FLAG_LOOSE: g } = et, C = (v) => v.value === "<0.0.0-0", I = (v) => v.value === "", N = (v, p) => {
+  } = De, { FLAG_INCLUDE_PRERELEASE: h, FLAG_LOOSE: g } = tt, C = (v) => v.value === "<0.0.0-0", I = (v) => v.value === "", N = (v, p) => {
     let y = !0;
     const m = v.slice();
     let b = m.pop();
     for (; y && m.length; )
       y = m.every((w) => b.intersects(w, p)), b = m.pop();
     return y;
-  }, K = (v, p) => (i("comp", v, p), v = T(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) => he(y, p)).join(" "), he = (v, p) => {
+  }, K = (v, p) => (i("comp", v, p), v = T(v, p), i("caret", v), v = oe(v, p), i("tildes", v), v = ne(v, p), i("xrange", v), v = J(v, p), i("stars", v), v), k = (v) => !v || v.toLowerCase() === "x" || v === "*", oe = (v, p) => v.trim().split(/\s+/).map((y) => he(y, p)).join(" "), he = (v, p) => {
     const y = p.loose ? a[l.TILDELOOSE] : a[l.TILDE];
     return v.replace(y, (m, b, w, R, O) => {
       i("tilde", v, m, b, w, R, O);
       let E;
-      return P(b) ? E = "" : P(w) ? E = `>=${b}.0.0 <${+b + 1}.0.0-0` : P(R) ? E = `>=${b}.${w}.0 <${b}.${+w + 1}.0-0` : O ? (i("replaceTilde pr", O), E = `>=${b}.${w}.${R}-${O} <${b}.${+w + 1}.0-0`) : E = `>=${b}.${w}.${R} <${b}.${+w + 1}.0-0`, i("tilde return", E), E;
+      return k(b) ? E = "" : k(w) ? E = `>=${b}.0.0 <${+b + 1}.0.0-0` : k(R) ? E = `>=${b}.${w}.0 <${b}.${+w + 1}.0-0` : O ? (i("replaceTilde pr", O), E = `>=${b}.${w}.${R}-${O} <${b}.${+w + 1}.0-0`) : E = `>=${b}.${w}.${R} <${b}.${+w + 1}.0-0`, i("tilde return", E), E;
     });
   }, T = (v, p) => v.trim().split(/\s+/).map((y) => q(y, p)).join(" "), q = (v, p) => {
     i("caret", v, p);
@@ -4006,17 +4008,17 @@ function Z() {
     return v.replace(y, (b, w, R, O, E) => {
       i("caret", v, b, w, R, O, E);
       let A;
-      return P(w) ? A = "" : P(R) ? A = `>=${w}.0.0${m} <${+w + 1}.0.0-0` : P(O) ? w === "0" ? A = `>=${w}.${R}.0${m} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.0${m} <${+w + 1}.0.0-0` : E ? (i("replaceCaret pr", E), w === "0" ? R === "0" ? A = `>=${w}.${R}.${O}-${E} <${w}.${R}.${+O + 1}-0` : A = `>=${w}.${R}.${O}-${E} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.${O}-${E} <${+w + 1}.0.0-0`) : (i("no pr"), w === "0" ? R === "0" ? A = `>=${w}.${R}.${O}${m} <${w}.${R}.${+O + 1}-0` : A = `>=${w}.${R}.${O}${m} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.${O} <${+w + 1}.0.0-0`), i("caret return", A), A;
+      return k(w) ? A = "" : k(R) ? A = `>=${w}.0.0${m} <${+w + 1}.0.0-0` : k(O) ? w === "0" ? A = `>=${w}.${R}.0${m} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.0${m} <${+w + 1}.0.0-0` : E ? (i("replaceCaret pr", E), w === "0" ? R === "0" ? A = `>=${w}.${R}.${O}-${E} <${w}.${R}.${+O + 1}-0` : A = `>=${w}.${R}.${O}-${E} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.${O}-${E} <${+w + 1}.0.0-0`) : (i("no pr"), w === "0" ? R === "0" ? A = `>=${w}.${R}.${O}${m} <${w}.${R}.${+O + 1}-0` : A = `>=${w}.${R}.${O}${m} <${w}.${+R + 1}.0-0` : A = `>=${w}.${R}.${O} <${+w + 1}.0.0-0`), i("caret return", A), A;
     });
-  }, oe = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((y) => H(y, p)).join(" ")), H = (v, p) => {
+  }, ne = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((y) => H(y, p)).join(" ")), H = (v, p) => {
     v = v.trim();
     const y = p.loose ? a[l.XRANGELOOSE] : a[l.XRANGE];
     return v.replace(y, (m, b, w, R, O, E) => {
       i("xRange", v, m, b, w, R, O, E);
-      const A = P(w), D = A || P(R), F = D || P(O), ge = F;
+      const A = k(w), D = A || k(R), F = D || k(O), ge = F;
       return b === "=" && ge && (b = ""), E = p.includePrerelease ? "-0" : "", A ? b === ">" || b === "<" ? m = "<0.0.0-0" : m = "*" : b && ge ? (D && (R = 0), O = 0, b === ">" ? (b = ">=", D ? (w = +w + 1, R = 0, O = 0) : (R = +R + 1, O = 0)) : b === "<=" && (b = "<", D ? w = +w + 1 : R = +R + 1), b === "<" && (E = "-0"), m = `${b + w}.${R}.${O}${E}`) : D ? m = `>=${w}.0.0${E} <${+w + 1}.0.0-0` : F && (m = `>=${w}.${R}.0${E} <${w}.${+R + 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], "")), z = (v) => (p, y, m, b, w, R, O, E, A, D, F, ge) => (P(m) ? y = "" : P(b) ? y = `>=${m}.0.0${v ? "-0" : ""}` : P(w) ? y = `>=${m}.${b}.0${v ? "-0" : ""}` : R ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, P(A) ? E = "" : P(D) ? E = `<${+A + 1}.0.0-0` : P(F) ? E = `<${A}.${+D + 1}.0-0` : ge ? E = `<=${A}.${D}.${F}-${ge}` : v ? E = `<${A}.${D}.${+F + 1}-0` : E = `<=${E}`, `${y} ${E}`.trim()), fe = (v, p, y) => {
+  }, 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], "")), z = (v) => (p, y, m, b, w, R, O, E, A, D, F, ge) => (k(m) ? y = "" : k(b) ? y = `>=${m}.0.0${v ? "-0" : ""}` : k(w) ? y = `>=${m}.${b}.0${v ? "-0" : ""}` : R ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, k(A) ? E = "" : k(D) ? E = `<${+A + 1}.0.0-0` : k(F) ? E = `<${A}.${+D + 1}.0-0` : ge ? E = `<=${A}.${D}.${F}-${ge}` : v ? E = `<${A}.${D}.${+F + 1}-0` : E = `<=${E}`, `${y} ${E}`.trim()), fe = (v, p, y) => {
     for (let m = 0; m < v.length; m++)
       if (!v[m].test(p))
         return !1;
@@ -4031,11 +4033,11 @@ function Z() {
     }
     return !0;
   };
-  return lt;
+  return ut;
 }
-var ut, Rr;
-function st() {
-  if (Rr) return ut;
+var dt, Rr;
+function ot() {
+  if (Rr) return dt;
   Rr = 1;
   const s = Symbol("SemVer ANY");
   class e {
@@ -4076,56 +4078,56 @@ function st() {
       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(">")));
     }
   }
-  ut = e;
-  const t = Bt, { safeRe: r, t: o } = De, n = ws, i = tt, c = _, a = Z();
-  return ut;
+  dt = e;
+  const t = jt, { safeRe: r, t: o } = De, n = ws, i = rt, c = _, a = Z();
+  return dt;
 }
-const Ba = Z(), ja = (s, e, t) => {
+const ja = Z(), xa = (s, e, t) => {
   try {
-    e = new Ba(e, t);
+    e = new ja(e, t);
   } catch {
     return !1;
   }
   return e.test(s);
 };
-var ot = ja;
-const xa = Z(), Va = (s, e) => new xa(s, e).set.map((t) => t.map((r) => r.value).join(" ").trim().split(" "));
-var Ua = Va;
-const Ja = _, Ga = Z(), Ma = (s, e, t) => {
+var nt = xa;
+const Va = Z(), Ua = (s, e) => new Va(s, e).set.map((t) => t.map((r) => r.value).join(" ").trim().split(" "));
+var Ja = Ua;
+const Ga = _, Ma = Z(), _a = (s, e, t) => {
   let r = null, o = null, n = null;
   try {
-    n = new Ga(e, t);
+    n = new Ma(e, t);
   } catch {
     return null;
   }
   return s.forEach((i) => {
-    n.test(i) && (!r || o.compare(i) === -1) && (r = i, o = new Ja(r, t));
+    n.test(i) && (!r || o.compare(i) === -1) && (r = i, o = new Ga(r, t));
   }), r;
 };
-var _a = Ma;
-const Ka = _, Ha = Z(), Wa = (s, e, t) => {
+var Ka = _a;
+const Ha = _, Wa = Z(), qa = (s, e, t) => {
   let r = null, o = null, n = null;
   try {
-    n = new Ha(e, t);
+    n = new Wa(e, t);
   } catch {
     return null;
   }
   return s.forEach((i) => {
-    n.test(i) && (!r || o.compare(i) === 1) && (r = i, o = new Ka(r, t));
+    n.test(i) && (!r || o.compare(i) === 1) && (r = i, o = new Ha(r, t));
   }), r;
 };
-var qa = Wa;
-const dt = _, za = Z(), Cr = rt, Xa = (s, e) => {
-  s = new za(s, e);
-  let t = new dt("0.0.0");
-  if (s.test(t) || (t = new dt("0.0.0-0"), s.test(t)))
+var za = qa;
+const pt = _, Xa = Z(), Cr = st, Ya = (s, e) => {
+  s = new Xa(s, e);
+  let t = new pt("0.0.0");
+  if (s.test(t) || (t = new pt("0.0.0-0"), s.test(t)))
     return t;
   t = null;
   for (let r = 0; r < s.set.length; ++r) {
     const o = s.set[r];
     let n = null;
     o.forEach((i) => {
-      const c = new dt(i.semver.version);
+      const c = new pt(i.semver.version);
       switch (i.operator) {
         case ">":
           c.prerelease.length === 0 ? c.patch++ : c.prerelease.push(0), c.raw = c.format();
@@ -4143,35 +4145,35 @@ const dt = _, za = Z(), Cr = rt, Xa = (s, e) => {
   }
   return t && s.test(t) ? t : null;
 };
-var Ya = Xa;
-const Qa = Z(), Za = (s, e) => {
+var Qa = Ya;
+const Za = Z(), ec = (s, e) => {
   try {
-    return new Qa(s, e).range || "*";
+    return new Za(s, e).range || "*";
   } catch {
     return null;
   }
 };
-var ec = Za;
-const tc = _, Ss = st(), { ANY: rc } = Ss, sc = Z(), oc = ot, Er = rt, kr = xt, nc = Ut, ic = Vt, ac = (s, e, t, r) => {
-  s = new tc(s, r), e = new sc(e, r);
+var tc = ec;
+const rc = _, Ss = ot(), { ANY: sc } = Ss, oc = Z(), nc = nt, Er = st, Pr = Vt, ic = Jt, ac = Ut, cc = (s, e, t, r) => {
+  s = new rc(s, r), e = new oc(e, r);
   let o, n, i, c, a;
   switch (t) {
     case ">":
-      o = Er, n = nc, i = kr, c = ">", a = ">=";
+      o = Er, n = ic, i = Pr, c = ">", a = ">=";
       break;
     case "<":
-      o = kr, n = ic, i = Er, c = "<", a = "<=";
+      o = Pr, n = ac, i = Er, c = "<", a = "<=";
       break;
     default:
       throw new TypeError('Must provide a hilo val of "<" or ">"');
   }
-  if (oc(s, e, r))
+  if (nc(s, e, r))
     return !1;
   for (let l = 0; l < e.set.length; ++l) {
     const u = e.set[l];
     let d = null, f = null;
     if (u.forEach((h) => {
-      h.semver === rc && (h = new Ss(">=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);
+      h.semver === sc && (h = new Ss(">=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))
       return !1;
     if (f.operator === a && i(s, f.semver))
@@ -4179,20 +4181,20 @@ const tc = _, Ss = st(), { ANY: rc } = Ss, sc = Z(), oc = ot, Er = rt, kr = xt,
   }
   return !0;
 };
-var Jt = ac;
-const cc = Jt, lc = (s, e, t) => cc(s, e, ">", t);
-var uc = lc;
-const dc = Jt, pc = (s, e, t) => dc(s, e, "<", t);
-var hc = pc;
-const Pr = Z(), fc = (s, e, t) => (s = new Pr(s, t), e = new Pr(e, t), s.intersects(e, t));
-var gc = fc;
-const mc = ot, vc = Q;
-var yc = (s, e, t) => {
+var Gt = cc;
+const lc = Gt, uc = (s, e, t) => lc(s, e, ">", t);
+var dc = uc;
+const pc = Gt, hc = (s, e, t) => pc(s, e, "<", t);
+var fc = hc;
+const kr = Z(), gc = (s, e, t) => (s = new kr(s, t), e = new kr(e, t), s.intersects(e, t));
+var mc = gc;
+const vc = nt, yc = Q;
+var wc = (s, e, t) => {
   const r = [];
   let o = null, n = null;
-  const i = s.sort((u, d) => vc(u, d, t));
+  const i = s.sort((u, d) => yc(u, d, t));
   for (const u of i)
-    mc(u, e, t) ? (n = u, o || (o = u)) : (n && r.push([o, n]), n = null, o = null);
+    vc(u, e, t) ? (n = u, o || (o = u)) : (n && r.push([o, n]), n = null, o = null);
   o && r.push([o, null]);
   const c = [];
   for (const [u, d] of r)
@@ -4200,14 +4202,14 @@ var yc = (s, e, t) => {
   const a = c.join(" || "), l = typeof e.raw == "string" ? e.raw : String(e);
   return a.length < l.length ? a : e;
 };
-const Or = Z(), Gt = st(), { ANY: pt } = Gt, Re = ot, Mt = Q, wc = (s, e, t = {}) => {
+const Or = Z(), Mt = ot(), { ANY: ht } = Mt, Re = nt, _t = Q, Sc = (s, e, t = {}) => {
   if (s === e)
     return !0;
   s = new Or(s, t), e = new Or(e, t);
   let r = !1;
   e: for (const o of s.set) {
     for (const n of e.set) {
-      const i = bc(o, n, t);
+      const i = Rc(o, n, t);
       if (r = r || i !== null, i)
         continue e;
     }
@@ -4215,15 +4217,15 @@ const Or = Z(), Gt = st(), { ANY: pt } = Gt, Re = ot, Mt = Q, wc = (s, e, t = {}
       return !1;
   }
   return !0;
-}, Sc = [new Gt(">=0.0.0-0")], $r = [new Gt(">=0.0.0")], bc = (s, e, t) => {
+}, bc = [new Mt(">=0.0.0-0")], $r = [new Mt(">=0.0.0")], Rc = (s, e, t) => {
   if (s === e)
     return !0;
-  if (s.length === 1 && s[0].semver === pt) {
-    if (e.length === 1 && e[0].semver === pt)
+  if (s.length === 1 && s[0].semver === ht) {
+    if (e.length === 1 && e[0].semver === ht)
       return !0;
-    t.includePrerelease ? s = Sc : s = $r;
+    t.includePrerelease ? s = bc : s = $r;
   }
-  if (e.length === 1 && e[0].semver === pt) {
+  if (e.length === 1 && e[0].semver === ht) {
     if (t.includePrerelease)
       return !0;
     e = $r;
@@ -4236,7 +4238,7 @@ const Or = Z(), Gt = st(), { ANY: pt } = Gt, Re = ot, Mt = Q, wc = (s, e, t = {}
     return null;
   let i;
   if (o && n) {
-    if (i = Mt(o.semver, n.semver, t), i > 0)
+    if (i = _t(o.semver, n.semver, t), i > 0)
       return null;
     if (i === 0 && (o.operator !== ">=" || n.operator !== "<="))
       return null;
@@ -4273,69 +4275,69 @@ const Or = Z(), Gt = st(), { ANY: pt } = Gt, Re = ot, Mt = Q, wc = (s, e, t = {}
 }, Fr = (s, e, t) => {
   if (!s)
     return e;
-  const r = Mt(s.semver, e.semver, t);
+  const r = _t(s.semver, e.semver, t);
   return r > 0 ? s : r < 0 || e.operator === ">" && s.operator === ">=" ? e : s;
 }, Ir = (s, e, t) => {
   if (!s)
     return e;
-  const r = Mt(s.semver, e.semver, t);
+  const r = _t(s.semver, e.semver, t);
   return r < 0 ? s : r > 0 || e.operator === "<" && s.operator === "<=" ? e : s;
 };
-var Rc = wc;
-const ht = De, Ar = et, Cc = _, Tr = ms, Ec = Se, kc = Ai, Pc = Ni, Oc = Bi, $c = xi, Fc = Ji, Ic = _i, Ac = Wi, Tc = Xi, Lc = Q, Nc = ea, Dc = sa, Bc = jt, jc = aa, xc = ua, Vc = rt, Uc = xt, Jc = vs, Gc = ys, Mc = Vt, _c = Ut, Kc = ws, Hc = La, Wc = st(), qc = Z(), zc = ot, Xc = Ua, Yc = _a, Qc = qa, Zc = Ya, el = ec, tl = Jt, rl = uc, sl = hc, ol = gc, nl = yc, il = Rc;
-var al = {
-  parse: Ec,
+var Cc = Sc;
+const ft = De, Ar = tt, Ec = _, Tr = ms, Pc = Se, kc = Ti, Oc = Di, $c = ji, Fc = Vi, Ic = Gi, Ac = Ki, Tc = qi, Lc = Yi, Nc = Q, Dc = ta, Bc = oa, jc = xt, xc = ca, Vc = da, Uc = st, Jc = Vt, Gc = vs, Mc = ys, _c = Ut, Kc = Jt, Hc = ws, Wc = Na, qc = ot(), zc = Z(), Xc = nt, Yc = Ja, Qc = Ka, Zc = za, el = Qa, tl = tc, rl = Gt, sl = dc, ol = fc, nl = mc, il = wc, al = Cc;
+var cl = {
+  parse: Pc,
   valid: kc,
-  clean: Pc,
-  inc: Oc,
-  diff: $c,
-  major: Fc,
-  minor: Ic,
-  patch: Ac,
-  prerelease: Tc,
-  compare: Lc,
-  rcompare: Nc,
-  compareLoose: Dc,
-  compareBuild: Bc,
-  sort: jc,
-  rsort: xc,
-  gt: Vc,
-  lt: Uc,
-  eq: Jc,
-  neq: Gc,
-  gte: Mc,
-  lte: _c,
-  cmp: Kc,
-  coerce: Hc,
-  Comparator: Wc,
-  Range: qc,
-  satisfies: zc,
-  toComparators: Xc,
-  maxSatisfying: Yc,
-  minSatisfying: Qc,
-  minVersion: Zc,
-  validRange: el,
-  outside: tl,
-  gtr: rl,
-  ltr: sl,
-  intersects: ol,
-  simplifyRange: nl,
-  subset: il,
-  SemVer: Cc,
-  re: ht.re,
-  src: ht.src,
-  tokens: ht.t,
+  clean: Oc,
+  inc: $c,
+  diff: Fc,
+  major: Ic,
+  minor: Ac,
+  patch: Tc,
+  prerelease: Lc,
+  compare: Nc,
+  rcompare: Dc,
+  compareLoose: Bc,
+  compareBuild: jc,
+  sort: xc,
+  rsort: Vc,
+  gt: Uc,
+  lt: Jc,
+  eq: Gc,
+  neq: Mc,
+  gte: _c,
+  lte: Kc,
+  cmp: Hc,
+  coerce: Wc,
+  Comparator: qc,
+  Range: zc,
+  satisfies: Xc,
+  toComparators: Yc,
+  maxSatisfying: Qc,
+  minSatisfying: Zc,
+  minVersion: el,
+  validRange: tl,
+  outside: rl,
+  gtr: sl,
+  ltr: ol,
+  intersects: nl,
+  simplifyRange: il,
+  subset: al,
+  SemVer: Ec,
+  re: ft.re,
+  src: ft.src,
+  tokens: ft.t,
   SEMVER_SPEC_VERSION: Ar.SEMVER_SPEC_VERSION,
   RELEASE_TYPES: Ar.RELEASE_TYPES,
   compareIdentifiers: Tr.compareIdentifiers,
   rcompareIdentifiers: Tr.rcompareIdentifiers
 };
-const cl = /* @__PURE__ */ gi(al), ll = {
+const ll = /* @__PURE__ */ mi(cl), ul = {
   minDelay: 1500
-}, ul = "__no_updates__";
-class dl extends qs {
+}, dl = "__no_updates__";
+class pl extends qs {
   constructor(t, r, o = {}) {
-    super({ ...o, ...ll }, r);
+    super({ ...o, ...ul }, r);
     S(this, "http");
     S(this, "preferredUpdateChannel");
     this.registryProvider = t, this.http = o.http, this.preferredUpdateChannel = o.preferredUpdateChannel;
@@ -4349,7 +4351,7 @@ class dl extends qs {
       case "from-registry-v2":
         return `from_registry_v2_${re(t)}`;
       default:
-        return ul;
+        return dl;
     }
   }
   async readValue(t) {
@@ -4366,9 +4368,9 @@ class dl extends qs {
           }
         case "dev-v2":
           try {
-            const i = await mt(n.folder, this.logger);
+            const i = await vt(n.folder, this.logger);
             if (i === void 0) return { suggestions: [] };
-            const c = await It(i);
+            const c = await At(i);
             return c === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: c }, suggestions: [] };
           } catch (i) {
             return this.logger.warn(i), { suggestions: [] };
@@ -4381,7 +4383,7 @@ class dl extends qs {
             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 a.getLatestOverview(n.id, ae)) u = ae;
                 else {
                   if (await a.getLatestOverview(n.id, we) === void 0)
                     return this.logger.error(
@@ -4410,7 +4412,7 @@ class dl extends qs {
               update: { ...n, id: { ...n.id, version: I } }
             }));
             if (f === void 0) return { suggestions: h };
-            if (c !== void 0 && cl.lte(f, c))
+            if (c !== void 0 && ll.lte(f, c))
               return { suggestions: h };
             const g = {
               ...n,
@@ -4473,16 +4475,17 @@ class Lr {
   }
 }
 let Ce;
-function ue() {
+function te() {
   return Ce || (Ce = {
-    logPFrameRequests: process.env.MI_LOG_PFRAMES !== void 0
+    logPFrameRequests: process.env.MI_LOG_PFRAMES !== void 0,
+    usePFrameRs: process.env.MI_USE_PFRAMES_RS !== void 0
   }, process.env.MI_LOG_TREE_STAT && (Ce.logTreeStats = process.env.MI_LOG_TREE_STAT === "cumulative" ? "cumulative" : "per-request"), Ce);
 }
 function Nr(s) {
   return String(s.id);
 }
-const pl = ["Int", "Long", "Float", "Double", "String", "Bytes"];
-function ft(s) {
+const hl = ["Int", "Long", "Float", "Double", "String", "Bytes"];
+function gt(s) {
   const e = [], t = [];
   for (const r of s)
     r.type === "bySingleColumn" ? (e.push(r), t.push({
@@ -4498,7 +4501,7 @@ function ft(s) {
   return s;
 }
 const Ee = (s, e) => typeof e == "bigint" ? e.toString() : e;
-class hl {
+class fl {
   constructor(e, t, r, o) {
     S(this, "specPFrame");
     S(this, "blobIdToResource", /* @__PURE__ */ new Map());
@@ -4534,29 +4537,36 @@ class hl {
       }
     };
     for (const a of o)
-      for (const l of dn(a.data))
+      for (const l of pn(a.data))
         this.blobIdToResource.set(Nr(l), l);
     const i = () => {
-      const a = ue().logPFrameRequests ? new Yt(n) : new Yt();
-      for (const l of o)
-        try {
+      if (te().usePFrameRs) {
+        const a = new po(te().logPFrameRequests ? n : void 0);
+        for (const l of o)
           a.addColumnSpec(l.id, l.spec);
-        } catch (u) {
-          throw new Error(
-            `Adding column ${l.id} to PFrame failed: ${u}; Spec: ${JSON.stringify(l.spec)}.`
-          );
-        }
-      return a;
+        return a;
+      } else {
+        const a = te().logPFrameRequests ? new Ve(n) : new Ve();
+        for (const l of o)
+          try {
+            a.addColumnSpec(l.id, l.spec);
+          } catch (u) {
+            throw new Error(
+              `Adding column ${l.id} to PFrame failed: ${u}; Spec: ${JSON.stringify(l.spec)}.`
+            );
+          }
+        return a;
+      }
     }, c = () => {
-      const a = i();
+      const a = te().logPFrameRequests ? new Ve(n) : new Ve();
       a.setDataSource(this);
       for (const l of o) {
-        const u = pn(l.data, Nr);
+        const u = hn(l.data, Nr);
         try {
-          a.setColumnData(l.id, u);
+          a.addColumnSpec(l.id, l.spec), a.setColumnData(l.id, u);
         } catch (d) {
           throw new Error(
-            `Setting column ${l.id} data to PFrame failed: ${d}; Spec: ${JSON.stringify(l.spec)}, DataInfo: ${JSON.stringify(u)}.`
+            `Adding column ${l.id} to PFrame failed: ${d}; Spec: ${JSON.stringify(l.spec)}, DataInfo: ${JSON.stringify(u)}.`
           );
         }
       }
@@ -4585,7 +4595,7 @@ class hl {
     this.specPFrame.dispose();
   }
 }
-class fl {
+class gl {
   constructor(e, t) {
     S(this, "pFrames");
     S(this, "pTables");
@@ -4593,7 +4603,7 @@ class fl {
     /** Limits concurrent requests to PFrame API to prevent deadlock with Node's IO threads */
     S(this, "concurrencyLimiter");
     this.blobDriver = e, this.logger = t;
-    const r = new po({
+    const r = new ho({
       maxSize: 1e9,
       // 1Gb
       fetchMethod: async (n) => await Ur.readFile(n),
@@ -4604,12 +4614,12 @@ class fl {
         super(), this.blobDriver = n, this.logger = i;
       }
       createNewResource(n) {
-        return ue().logPFrameRequests && t.info(
+        return te().logPFrameRequests && t.info(
           `PFrame creation (pFrameHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
-        ), new hl(this.blobDriver, this.logger, r, n);
+        ), new fl(this.blobDriver, this.logger, r, n);
       }
       calculateParamsKey(n) {
-        return ml(n);
+        return vl(n);
       }
     }(this.blobDriver, this.logger), this.pTables = new class extends Lr {
       constructor(n) {
@@ -4619,13 +4629,13 @@ class fl {
         const i = n.pFrameHandle, c = await o.run(async () => {
           var l = [];
           try {
-            ue().logPFrameRequests && t.info(
+            te().logPFrameRequests && t.info(
               `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
             );
             const a = Be(l, this.pFrames.getByKey(i).disposableDataPFrame);
             return await a.dataPFrame.createTable({
               src: Fe(n.def.src),
-              filters: ft(n.def.filters)
+              filters: gt(n.def.filters)
             });
           } catch (u) {
             var d = u, f = !0;
@@ -4636,7 +4646,7 @@ class fl {
         return n.def.sorting.length !== 0 ? c.sort(n.def.sorting) : c;
       }
       calculateParamsKey(n) {
-        return gl(n);
+        return ml(n);
       }
     }(this.pFrames);
   }
@@ -4644,19 +4654,19 @@ class fl {
   // Internal / Config API Methods
   //
   createPFrame(e, t) {
-    const r = e.filter((n) => pl.find((i) => i === n.spec.valueType)).map(
-      (n) => le(
+    const r = e.filter((n) => hl.find((i) => i === n.spec.valueType)).map(
+      (n) => ue(
         n,
-        (i) => Ws(i) ? yn(i) : wn(n.spec, i)
+        (i) => Ws(i) ? wn(i) : Sn(n.spec, i)
       )
     ), o = this.pFrames.acquire(r);
     return t.addOnDestroy(o.unref), o.key;
   }
   createPTable(e, t) {
-    const r = this.createPFrame($s(e.src), t), o = gt(e, (i) => i.id), n = this.pTables.acquire({ def: o, pFrameHandle: r });
-    return ue().logPFrameRequests && this.logger.info(
+    const r = this.createPFrame($s(e.src), t), o = mt(e, (i) => i.id), n = this.pTables.acquire({ def: o, pFrameHandle: r });
+    return te().logPFrameRequests && this.logger.info(
       `Create PTable call (pFrameHandle = ${r}; pTableHandle = ${JSON.stringify(n)}): ${JSON.stringify(
-        gt(e, (i) => i.spec),
+        mt(e, (i) => i.spec),
         Ee
       )}`
     ), t.addOnDestroy(n.unref), n.key;
@@ -4667,7 +4677,14 @@ class fl {
   async findColumns(e, t) {
     const r = {
       ...t,
-      compatibleWith: t.compatibleWith.length !== 0 ? [{ axesSpec: t.compatibleWith, qualifications: [] }] : []
+      compatibleWith: t.compatibleWith.length !== 0 ? [{
+        axesSpec: [
+          ...new Map(t.compatibleWith.map(
+            (n) => [re(n), n]
+          )).values()
+        ],
+        qualifications: []
+      }] : []
     };
     return {
       hits: (await this.concurrencyLimiter.run(
@@ -4692,13 +4709,13 @@ class fl {
     let r = await this.concurrencyLimiter.run(async () => {
       var c = [];
       try {
-        ue().logPFrameRequests && this.logger.info(
+        te().logPFrameRequests && this.logger.info(
           `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
         );
         const i = Be(c, this.pFrames.getByKey(e).disposableDataPFrame);
         return await i.dataPFrame.createTable({
           src: Fe(t.src),
-          filters: ft(t.filters)
+          filters: gt(t.filters)
         });
       } catch (a) {
         var l = a, u = !0;
@@ -4724,13 +4741,13 @@ class fl {
     return await this.concurrencyLimiter.run(async () => {
       var o = [];
       try {
-        ue().logPFrameRequests && this.logger.info(
+        te().logPFrameRequests && this.logger.info(
           `Call getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
         );
         const r = Be(o, this.pFrames.getByKey(e).disposableDataPFrame);
         return await r.dataPFrame.getUniqueValues({
           ...t,
-          filters: ft(t.filters)
+          filters: gt(t.filters)
         });
       } catch (n) {
         var i = n, c = !0;
@@ -4779,13 +4796,13 @@ function Fe(s) {
       M(s);
   }
 }
-function gl(s) {
+function ml(s) {
   const e = Ne("sha256");
   return e.update(re(s)), e.digest().toString("hex");
 }
-function ml(s) {
+function vl(s) {
   const e = [...s].map(
-    (r) => le(r, (o) => {
+    (r) => ue(r, (o) => {
       let n;
       const i = o.type;
       switch (i) {
@@ -4829,7 +4846,7 @@ function ml(s) {
   const t = Ne("sha256");
   return t.update(re(e)), t.digest().toString("hex");
 }
-async function vl(s, e, t) {
+async function yl(s, e, t) {
   const r = {
     ...ps,
     ...hs(e),
@@ -4860,7 +4877,7 @@ async function vl(s, e, t) {
     r.localProjections,
     r.openFileDialogCallback,
     r.virtualLocalStoragesOverride
-  ), C = new fl(l, r.logger);
+  ), C = new gl(l, r.logger);
   return {
     blobDriver: l,
     blobToURLDriver: u,
@@ -4892,7 +4909,7 @@ class bs {
   /** Creates a project with initial state and adds it to project list. */
   async createProject(e, t = Ie()) {
     const r = await this.pl.withWriteTx("MLCreateProject", async (o) => {
-      const n = await un(o, e);
+      const n = await dn(o, e);
       return o.createField(j(this.projectListResourceId, t), "Dynamic", n), await o.commit(), await _s(n);
     });
     return await this.projectListTree.refreshState(), r;
@@ -4913,7 +4930,7 @@ class bs {
   async projectIdToResourceId(e) {
     return await this.pl.withReadTx("Project id to resource id", async (t) => {
       const r = (await t.getField(j(this.projectListResourceId, e))).value;
-      if (qe(r)) throw new Error("Unexpected project list structure.");
+      if (ze(r)) throw new Error("Unexpected project list structure.");
       return r;
     });
   }
@@ -4924,7 +4941,7 @@ class bs {
   async openProject(e) {
     const t = await this.ensureProjectRid(e);
     if (this.openedProjectsByRid.has(t)) throw new Error(`Project ${t} already opened`);
-    this.openedProjectsByRid.set(t, await Dt.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
+    this.openedProjectsByRid.set(t, await Bt.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
   }
   /** Closes the project, and deallocate all corresponding resources. */
   async closeProject(e) {
@@ -4957,24 +4974,24 @@ class bs {
   /** Initialize middle layer */
   static async init(e, t, r) {
     const o = {
-      ...hi,
-      ...fi(t),
+      ...fi,
+      ...gi(t),
       ...r
     };
-    o.defaultTreeOptions.logStat = ue().logTreeStats;
+    o.defaultTreeOptions.logStat = te().logTreeStats;
     const n = await e.withWriteTx("MLInitialization", async (C) => {
-      const I = j(C.clientRoot, Lo);
+      const I = j(C.clientRoot, No);
       C.createField(I, "Dynamic");
       const N = await C.getField(I);
-      if (qe(N.value)) {
+      if (ze(N.value)) {
         const K = C.createEphemeral(zr);
         return C.lock(K), C.setField(I, K), await C.commit(), await K.globalId;
       } else
         return N.value;
-    }), i = o.logger, c = await vl(e, t, o), a = new Is(e.httpDispatcher, {
+    }), i = o.logger, c = await yl(e, t, o), a = new Is(e.httpDispatcher, {
       minTimeout: 250,
       maxRetries: 4
-    }), l = new bo(a), u = new rn(
+    }), l = new Ro(a), u = new sn(
       l,
       c.signer,
       a
@@ -4992,13 +5009,13 @@ class bs {
       bpPreparer: u,
       frontendDownloadDriver: d,
       driverKit: c,
-      blockUpdateWatcher: new dl(l, i, {
+      blockUpdateWatcher: new pl(l, i, {
         minDelay: o.devBlockUpdateRecheckInterval,
         http: a,
         preferredUpdateChannel: o.preferredUpdateChannel
       }),
       quickJs: await Zs()
-    }, h = new zs([]), g = await Do(e, n, h, f);
+    }, h = new zs([]), g = await Bo(e, n, h, f);
     return new bs(
       f,
       c,
@@ -5011,7 +5028,7 @@ class bs {
     );
   }
 }
-const yl = [
+const wl = [
   "undici:request:create",
   // When a new request is created
   "undici:request:bodySent",
@@ -5049,7 +5066,7 @@ const yl = [
   "undici:dispatcher:retry"
   // When a dispatcher retries a request
 ];
-async function eu(s, e = {}) {
+async function ru(s, e = {}) {
   const t = {
     pingCheckDurationMs: 1e4,
     pingTimeoutMs: 3e3,
@@ -5067,8 +5084,8 @@ async function eu(s, e = {}) {
     bodyLimit: 300,
     ...e
   }, r = [];
-  yl.forEach((a) => {
-    ho(a).subscribe((u) => {
+  wl.forEach((a) => {
+    fo(a).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(
@@ -5089,36 +5106,36 @@ async function eu(s, e = {}) {
     autoUpdateCdnChecks: []
   }, n = Ks(s, { defaultRequestTimeout: t.pingTimeoutMs });
   o.plPings = await ve(t.pingCheckDurationMs, t.maxPingsPerSecond, async () => {
-    const l = await new zt(n).ping();
+    const l = await new Xt(n).ping();
     return JSON.stringify(l).slice(0, t.bodyLimit) + "...";
   });
-  const c = new zt(n).ll.httpDispatcher;
+  const c = new Xt(n).ll.httpDispatcher;
   return o.blockRegistryOverviewChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, c)
   ), o.blockGARegistryOverviewChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, c)
   ), o.blockRegistryUiChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockRegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockUiPath, t.blockRegistryUrl), t, c)
   ), o.blockGARegistryUiChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockGARegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockUiPath, t.blockGARegistryUrl), t, c)
   ), o.autoUpdateCdnChecks = await ve(
     t.autoUpdateCdnDurationMs,
     t.maxAutoUpdateCdnChecksPerSecond,
-    async () => await ke(t.autoUpdateCdnUrl, t, c)
-  ), wl(o, s, t, r);
+    async () => await Pe(t.autoUpdateCdnUrl, t, c)
+  ), Sl(o, s, t, r);
 }
 async function ve(s, e, t) {
-  const r = Ot(), o = [];
+  const r = $t(), o = [];
   for (; Dr(r) < s; ) {
-    const n = Ot();
+    const n = $t();
     let i;
     try {
       i = { ok: !0, value: await t() };
@@ -5135,8 +5152,8 @@ async function ve(s, e, t) {
   }
   return o;
 }
-async function ke(s, e, t) {
-  const { body: r, statusCode: o } = await ae(s, {
+async function Pe(s, e, t) {
+  const { body: r, statusCode: o } = await ce(s, {
     dispatcher: t,
     headersTimeout: e.httpTimeoutMs,
     bodyTimeout: e.httpTimeoutMs
@@ -5146,7 +5163,7 @@ async function ke(s, e, t) {
     beginningOfBody: n.slice(0, e.bodyLimit) + "..."
   };
 }
-function wl(s, e, t, r) {
+function Sl(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)))
   ];
@@ -5194,7 +5211,7 @@ ${r.join(`
 `;
 }
 function ye(s) {
-  const e = s.filter((o) => o.response.ok), { mean: t, median: r } = Sl(s);
+  const e = s.filter((o) => o.response.ok), { mean: t, median: r } = bl(s);
   return `
 total: ${s.length};
 successes: ${e.length};
@@ -5203,7 +5220,7 @@ mean in ms: ${t};
 median in ms: ${r};
 `;
 }
-function Sl(s) {
+function bl(s) {
   const e = s.map((o) => o.elapsedMs), t = e.reduce((o, n) => o + n) / e.length;
   let r;
   if (e.length > 0) {
@@ -5212,40 +5229,40 @@ function Sl(s) {
   }
   return { mean: t, median: r };
 }
-function Ot() {
+function $t() {
   return Date.now();
 }
 function Dr(s) {
-  return Ot() - s;
+  return $t() - s;
 }
 export {
-  Hl as BlockPackRegistry,
-  Wl as CentralBlockRegistry,
+  ql as BlockPackRegistry,
+  zl as CentralBlockRegistry,
   hs as DefaultDriverKitOpsPaths,
   ps as DefaultDriverKitOpsSettings,
-  fi as DefaultMiddleLayerOpsPaths,
-  hi as DefaultMiddleLayerOpsSettings,
+  gi as DefaultMiddleLayerOpsPaths,
+  fi as DefaultMiddleLayerOpsSettings,
   Zr as FrontendFromFolderResourceType,
   Qr as FrontendFromUrlResourceType,
   bs as MiddleLayer,
-  Dt as Project,
-  qo as TengoTemplateGet,
-  zo as TengoTemplateGetRegistry,
-  Yo as TengoTemplateGetTemplate,
-  Xo as TengoTemplateGetTemplateURI,
-  Xl as TengoTemplatePack,
-  Yl as TengoTemplatePackConvert,
-  Zl as TengoTemplatePackConvertTemplate,
-  Ql as TengoTemplatePackConvertTemplatePack,
-  zl as V1CentralDevSnapshotRegistry,
-  ql as V1CentralRegistry,
-  bo as V2RegistryProvider,
-  eu as checkNetwork,
+  Bt as Project,
+  zo as TengoTemplateGet,
+  Xo as TengoTemplateGetRegistry,
+  Qo as TengoTemplateGetTemplate,
+  Yo as TengoTemplateGetTemplateURI,
+  Ql as TengoTemplatePack,
+  Zl as TengoTemplatePackConvert,
+  tu as TengoTemplatePackConvertTemplate,
+  eu as TengoTemplatePackConvertTemplatePack,
+  Yl as V1CentralDevSnapshotRegistry,
+  Xl as V1CentralRegistry,
+  Ro as V2RegistryProvider,
+  ru as checkNetwork,
   Xr as createRenderTemplate,
   Hr as getDevV1PacketMtime,
-  It as getDevV2PacketMtime,
-  vl as initDriverKit,
-  Tt as loadTemplate,
-  Qo as prepareTemplateSpec
+  At as getDevV2PacketMtime,
+  yl as initDriverKit,
+  Lt as loadTemplate,
+  Zo as prepareTemplateSpec
 };
 //# sourceMappingURL=index.mjs.map