@milaboratories/pl-middle-layer 1.27.0 → 1.27.2

package/dist/index.mjs

@@ -1,62 +1,62 @@
 var Cs = Object.defineProperty;
-var Kt = (s, e) => (e = Symbol[s]) ? e : Symbol.for("Symbol." + s), Ht = (s) => {
+var Ht = (s, e) => (e = Symbol[s]) ? e : Symbol.for("Symbol." + s), Wt = (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) => {
+var je = (s, e, t) => {
   if (e != null) {
-    typeof e != "object" && typeof e != "function" && Ht("Object expected");
+    typeof e != "object" && typeof e != "function" && Wt("Object expected");
     var r;
-    t && (r = e[Kt("asyncDispose")]), r === void 0 && (r = e[Kt("dispose")]), typeof r != "function" && Ht("Object not disposable"), s.push([t, r, e]);
+    t && (r = e[Ht("asyncDispose")]), r === void 0 && (r = e[Ht("dispose")]), typeof r != "function" && Wt("Object not disposable"), s.push([t, r, e]);
   } else t && s.push([t]);
   return e;
-}, je = (s, e, t) => {
-  var r = typeof SuppressedError == "function" ? SuppressedError : function(i, c, a, l) {
-    return l = Error(a), l.name = "SuppressedError", l.error = i, l.suppressed = c, l;
+}, xe = (s, e, t) => {
+  var r = typeof SuppressedError == "function" ? SuppressedError : function(i, a, c, l) {
+    return l = Error(c), l.name = "SuppressedError", l.error = i, l.suppressed = a, l;
   }, o = (i) => e = t ? new r(i, e, "An error was suppressed during disposal") : (t = !0, i), n = (i) => {
     for (; i = s.pop(); )
       try {
-        var c = i[1] && i[1].call(i[2]);
-        if (i[0]) return Promise.resolve(c).then(n, (a) => (o(a), n()));
-      } catch (a) {
-        o(a);
+        var a = i[1] && i[1].call(i[2]);
+        if (i[0]) return Promise.resolve(a).then(n, (c) => (o(c), n()));
+      } catch (c) {
+        o(c);
       }
     if (t) throw e;
   };
   return n();
 };
-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";
+import { mapValueInVOE as Br, executePSpecPredicate as Ps, mapPObjectData as ue, mapPTableDef as vt, 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 ae, InitialBlockSettings as Wt, blockPackIdToString as Fs } from "@milaboratories/pl-model-middle-layer";
+import { AnyChannel as we, StableChannel as ae, InitialBlockSettings as qt, blockPackIdToString as Fs } from "@milaboratories/pl-model-middle-layer";
 export * from "@milaboratories/pl-model-middle-layer";
 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 { RegistryV1 as de, tryLoadPackDescription as yt, BlockPackMetaEmbedAbsoluteBytes as As, RegistryV2Reader as Ts, folderReaderByUrl as Ls, loadPackDescription as zt } 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 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";
+import { resourceTypesEqual as le, field as j, Pl as L, PlClient as xs, isNullResourceId as Xe, ensureResourceIdNotNull as wt, isResource as Vs, isResourceRef as Us, isNotNullResourceId as Xt, resourceType as Ne, resourceTypeToString as Js, resourceIdToString as Jr, isNotFoundError as Gs, isTimeoutOrCancelError as Ms, toGlobalResourceId as _s, plAddressToConfig as Ks, UnauthenticatedPlClient as Yt } 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 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 ie, PlTemplateOverrideV1 as ke, PlTemplateLibV1 as xe, PlTemplateSoftwareV1 as be } from "@milaboratories/pl-model-backend";
+import { Computable as U, ChangeSource as Qt, PollComputablePool as qs, WatchableValue as zs } from "@milaboratories/computable";
+import { randomUUID as Ae, createHash as De } from "node:crypto";
+import { parseTemplate as Xs, PlTemplateV1 as ie, PlTemplateOverrideV1 as ke, PlTemplateLibV1 as Ve, 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 Q from "canonicalize";
 import Qs from "node:assert";
-import { Scope as wt, getQuickJS as Zs } from "quickjs-emscripten";
+import { Scope as St, 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 Ve } from "@milaboratories/pframes-node";
+import { PFrame as Ue } 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) {
+async function Zt(s) {
   try {
     return await Ur.stat(s, { bigint: !0 });
   } catch (e) {
@@ -65,30 +65,30 @@ async function Qt(s) {
     throw e;
   }
 }
-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,
+const go = [de.PlPackageYamlConfigFile], mo = [de.PlPackageJsonConfigFile], It = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], At = ["config", "dist", "config.json"], Kr = ["frontend", "dist"], er = "block-model/dist/config.json", vo = "block-ui/package.json", yo = [
   It,
+  At,
   go,
   mo,
   Kr
 ];
 async function wo(s) {
-  return await Qt(G.join(s, ...It)) !== void 0 || await Qt(G.join(s, ...Ft)) !== void 0;
+  return await Zt(G.join(s, ...At)) !== void 0 || await Zt(G.join(s, ...It)) !== void 0;
 }
-function at(s, e) {
+function ct(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) {
+async function tr(s, e) {
   if (G.isAbsolute(s) || (s = G.resolve(s)), await wo(s))
     return {
-      workflow: G.join(s, ...Ft),
-      config: G.join(s, ...It),
+      workflow: G.join(s, ...It),
+      config: G.join(s, ...At),
       ui: G.join(s, ...Kr)
     };
   {
-    const t = at(s, Zt), r = at(s, Zt), o = at(s, vo);
+    const t = ct(s, er), r = ct(s, er), o = ct(s, vo);
     return { workflow: t, config: r, ui: G.resolve(o, "..", "dist") };
   }
 }
@@ -118,7 +118,7 @@ async function Hr(s) {
   }
   return e.toString();
 }
-async function At(s) {
+async function Tt(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 });
@@ -136,9 +136,9 @@ class ql {
           `${r.url}/${de.GlobalOverviewPath}`,
           o
         )).body.json();
-        for (const c of i) {
-          const { organization: a, package: l, latestMeta: u, latestVersion: d } = c, f = {
-            organization: a,
+        for (const a of i) {
+          const { organization: c, package: l, latestMeta: u, latestVersion: d } = a, f = {
+            organization: c,
             name: l,
             version: d
           }, h = {
@@ -147,7 +147,7 @@ class ql {
               title: u.title ?? "No title",
               description: u.description ?? "No Description",
               organization: {
-                name: a,
+                name: c,
                 url: "https://unknown.com"
               }
             },
@@ -164,32 +164,32 @@ class ql {
               [we]: h,
               [ae]: h
             },
-            allVersions: c.allVersions.map((g) => ({ version: g, channels: [] }))
+            allVersions: a.allVersions.map((g) => ({ version: g, channels: [] }))
           });
         }
         return t;
       case "remote-v2":
         return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map(
-          (c) => c.latestByChannel[ae] ? {
-            ...c,
+          (a) => a.latestByChannel[ae] ? {
+            ...a,
             registryId: e.id
           } : {
-            ...c,
+            ...a,
             latestByChannel: {
-              ...c.latestByChannel,
-              [ae]: ((a) => a.spec.type === "from-registry-v2" ? { ...a, spec: { ...a.spec, channel: ae } } : a)(c.latestByChannel[we])
+              ...a.latestByChannel,
+              [ae]: ((c) => c.spec.type === "from-registry-v2" ? { ...c, spec: { ...c.spec, channel: ae } } : c)(a.latestByChannel[we])
             },
             registryId: e.id
           }
         );
       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 So(
-            G.join(a, de.PlPackageYamlConfigFile)
+        for (const a of await X.promises.readdir(r.path, { withFileTypes: !0 })) {
+          if (!a.isDirectory()) continue;
+          const c = G.join(r.path, a.name), l = await So(
+            G.join(c, de.PlPackageYamlConfigFile)
           );
           if (l !== void 0) {
-            const u = de.PlPackageConfigData.parse(Ns.parse(l)), d = await Hr(a), f = {
+            const u = de.PlPackageConfigData.parse(Ns.parse(l)), d = await Hr(c), f = {
               organization: u.organization,
               name: u.package,
               version: "DEV"
@@ -205,7 +205,7 @@ class ql {
               },
               spec: {
                 type: "dev-v2",
-                folder: a,
+                folder: c,
                 mtime: d
               }
             };
@@ -219,13 +219,13 @@ class ql {
               allVersions: []
             });
           } else {
-            let u = a, d = await vt(u);
+            let u = c, d = await yt(u);
             if (d === void 0) {
               for (const f of ["block", "meta"])
-                if (u = G.join(a, f), d = await vt(u), d !== void 0) break;
+                if (u = G.join(c, f), d = await yt(u), d !== void 0) break;
             }
             if (d !== void 0) {
-              const f = await At(d), h = {
+              const f = await Tt(d), h = {
                 id: d.id,
                 meta: await As.parseAsync(d.meta),
                 spec: {
@@ -259,7 +259,7 @@ class ql {
   }
   async getOverview(e, t, r) {
     var i;
-    const o = (i = this.registries.find((c) => c.id === e)) == null ? void 0 : i.spec;
+    const o = (i = this.registries.find((a) => a.id === e)) == null ? void 0 : i.spec;
     if (!o) throw new Error(`Registry with id "${e}" not found`);
     if (o.type !== "remote-v2")
       throw new Error(
@@ -296,22 +296,22 @@ const zl = {
   blocksInLimbo: []
 }, Po = {
   label: "New Project"
-}, 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) {
+}, ko = { name: "UserProject", version: "2" }, Wr = "SchemaVersion", qr = "1", Lt = "ProjectCreated", Te = "ProjectLastModified", Le = "ProjectMeta", pe = "ProjectStructure", Ye = "BlockRenderingState", Oo = "BlockFrontendState/", $o = /^BlockFrontendState\/(?<blockid>.*)$/;
+function bt(s) {
   return `${Oo}${s}`;
 }
 const Fo = "BlockArgsAuthor/";
-function bt(s) {
+function Rt(s) {
   return `${Fo}${s}`;
 }
-const Rt = "ProjectStructureAuthor";
+const Ct = "ProjectStructureAuthor";
 function Io(s) {
   const e = s.match($o);
   if (e !== null)
     return e.groups.blockid;
 }
 const Ao = "__serviceTemplate_";
-function Ct(s) {
+function Et(s) {
   return `${Ao}${s}`;
 }
 function V(s, e) {
@@ -336,19 +336,19 @@ async function Bo(s, e, t, r) {
     r.logger
   );
   return { computable: U.make((i) => {
-    const c = i.accessor(o.entry()).node(), a = t.getValue(i);
-    if (c === void 0) return;
+    const a = i.accessor(o.entry()).node(), c = t.getValue(i);
+    if (a === void 0) return;
     const l = [];
-    for (const u of c.listDynamicFields()) {
-      const d = c.traverse(u);
+    for (const u of a.listDynamicFields()) {
+      const d = a.traverse(u);
       if (d === void 0) continue;
-      const f = B(d.getKeyValueAsJson(Te)), h = B(d.getKeyValueAsJson(Tt)), g = B(d.getKeyValueAsJson(Ae));
+      const f = B(d.getKeyValueAsJson(Le)), h = B(d.getKeyValueAsJson(Lt)), g = B(d.getKeyValueAsJson(Te));
       l.push({
         id: u,
         rid: d.id,
         created: new Date(h),
         lastModified: new Date(g),
-        opened: a.indexOf(d.id) >= 0,
+        opened: c.indexOf(d.id) >= 0,
         meta: f
       });
     }
@@ -364,11 +364,11 @@ const jo = {
 };
 function Xr(s, e, t, r, o) {
   if (o.length === 0) throw new Error("Zero output names provided");
-  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 n = t ? s.createEphemeral(jo) : s.createStruct(xo), i = j(n, "template"), a = j(n, "inputs");
+  return s.createField(i, "Input", e), s.createField(a, "Input", L.createPlMap(s, r, t)), s.lockInputs(n), L.futureRecord(s, n, o, "Output", "outputs/");
 }
 const Vo = { name: "BContextEnd", version: "1" }, Uo = { name: "BContext", version: "1" }, Jo = "id", Go = "parent/", Mo = ["context", "result"];
-function tr(s, e, t) {
+function rr(s, e, t) {
   return Xr(s, e, !0, t, Mo);
 }
 function _o(s) {
@@ -379,7 +379,7 @@ function Ko(s, e) {
   if (e.length === 0) return _o(s);
   if (e.length === 1) return e[0];
   const t = s.createEphemeral(Uo);
-  s.createField(j(t, Jo), "Input", L.createPlString(s, Ie()));
+  s.createField(j(t, Jo), "Input", L.createPlString(s, Ae()));
   for (let r = 0; r < e.length; r++)
     s.createField(j(t, `${Go}${r}`), "Input", e[r]);
   return s.lock(t), t;
@@ -393,17 +393,17 @@ function Ho(s, e) {
       M(r);
   }
 }
-const rr = {
+const sr = {
   hash(s, e) {
-    e.update(xe.type.name).update(xe.type.version).update(s.name).update(s.version).update(s.src);
+    e.update(Ve.type.name).update(Ve.type.version).update(s.name).update(s.version).update(s.src);
   },
   render(s, e, t) {
     return e.createValue(
-      xe.type,
-      JSON.stringify(xe.fromV2Data(s).data)
+      Ve.type,
+      JSON.stringify(Ve.fromV2Data(s).data)
     );
   }
-}, Ue = {
+}, Je = {
   hash(s, e) {
     e.update(be.type.name).update(be.type.version).update(s.name).update(s.version).update(s.src);
   },
@@ -426,11 +426,11 @@ const rr = {
     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);
+      e.update("lib:" + r), sr.hash(o, e);
     for (const [r, o] of t(Object.entries(s.software ?? {})))
-      e.update("soft:" + r), Ue.hash(o, e);
+      e.update("soft:" + r), Je.hash(o, e);
     for (const [r, o] of t(Object.entries(s.assets ?? {})))
-      e.update("asset:" + r), Ue.hash(o, e);
+      e.update("asset:" + r), Je.hash(o, e);
     for (const [r, o] of t(Object.entries(s.templates ?? {})))
       e.update("tpl:" + r), this.hash(o, e);
   },
@@ -439,21 +439,21 @@ const rr = {
       ie.type,
       JSON.stringify(ie.fromV2Data(s).data)
     );
-    for (const [i, c] of Object.entries(s.libs ?? {})) {
-      const a = ie.libField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, rr));
+    for (const [i, a] of Object.entries(s.libs ?? {})) {
+      const c = ie.libField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, sr));
     }
-    for (const [i, c] of Object.entries(s.software ?? {})) {
-      const a = ie.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Ue));
+    for (const [i, a] of Object.entries(s.software ?? {})) {
+      const c = ie.swField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, Je));
     }
-    for (const [i, c] of Object.entries(s.assets ?? {})) {
-      const a = ie.swField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Ue));
+    for (const [i, a] of Object.entries(s.assets ?? {})) {
+      const c = ie.swField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, Je));
     }
-    for (const [i, c] of Object.entries(s.templates ?? {})) {
-      const a = ie.tplField(r, i);
-      e.createField(a, "Input"), e.setField(a, t(c, Yr));
+    for (const [i, a] of Object.entries(s.templates ?? {})) {
+      const c = ie.tplField(r, i);
+      e.createField(c, "Input"), e.setField(c, t(a, Yr));
     }
     if (e.lock(r), !s.hashOverride) return r;
     const o = t(s, Wo), n = ke.tplField(o);
@@ -462,14 +462,14 @@ const rr = {
 };
 function qo(s, e) {
   const t = /* @__PURE__ */ new Map(), r = (o, n) => {
-    const i = Ne("sha256");
+    const i = De("sha256");
     n.hash(o, i);
-    const c = i.digest("hex");
-    if (!t.has(c)) {
-      const a = n.render(o, s, r);
-      t.set(c, a);
+    const a = i.digest("hex");
+    if (!t.has(a)) {
+      const c = n.render(o, s, r);
+      t.set(a, c);
     }
-    return t.get(c);
+    return t.get(a);
   };
   return r(e, Yr);
 }
@@ -495,7 +495,7 @@ 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 Lt(s, e) {
+function Nt(s, e) {
   switch (e.type) {
     case "from-registry":
       return en(s, e);
@@ -529,7 +529,7 @@ function tn(s, e) {
   }
 }
 const rn = { name: "BlockPackCustom", version: "1" }, es = "template", ts = "frontend";
-function sr(s) {
+function or(s) {
   return s.endsWith("/") ? s : `${s}/`;
 }
 class sn {
@@ -541,17 +541,17 @@ class sn {
       case "explicit":
         return e.config;
       case "dev-v1": {
-        const t = await er(e.folder), r = await X.promises.readFile(t.config, { encoding: "utf-8" });
+        const t = await tr(e.folder), r = await X.promises.readFile(t.config, { encoding: "utf-8" });
         return JSON.parse(r);
       }
       case "dev-v2": {
-        const t = await qt(e.folder), r = await X.promises.readFile(t.components.model.file, {
+        const t = await zt(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 })}`;
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${or(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`;
         return await (await ce(`${r}/config.json`, t)).body.json();
       }
       case "from-registry-v2": {
@@ -567,7 +567,7 @@ class sn {
       case "explicit":
         return e;
       case "dev-v1": {
-        const t = await er(e.folder), r = await X.promises.readFile(t.workflow), o = JSON.parse(
+        const t = await tr(e.folder), r = await X.promises.readFile(t.workflow), o = JSON.parse(
           await X.promises.readFile(t.config, "utf-8")
         ), n = t.ui;
         return {
@@ -586,14 +586,14 @@ class sn {
         };
       }
       case "dev-v2": {
-        const t = await qt(e.folder), r = JSON.parse(
+        const t = await zt(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 At(t)), {
+        return e.mtime === void 0 && (i.mtime = await Tt(t)), {
           type: "explicit",
           template: {
             type: "explicit",
@@ -609,19 +609,19 @@ class sn {
         };
       }
       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 ce(o, t);
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${or(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 ce(`${r}/config.json`, t)).body.json();
+        const i = new Uint8Array(await n.body.arrayBuffer()), c = await (await ce(`${r}/config.json`, t)).body.json();
         return {
           type: "explicit",
           template: {
             type: "explicit",
             content: i
           },
-          config: a,
+          config: c,
           frontend: {
             type: "url",
             url: `${r}/frontend.tgz`
@@ -630,14 +630,14 @@ class sn {
         };
       }
       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 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()]);
+        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(), [a, c] = await Promise.all([n(), i()]);
         return {
           type: "explicit",
           template: {
             type: "explicit",
-            content: Buffer.from(a)
+            content: Buffer.from(c)
           },
-          config: c,
+          config: a,
           frontend: {
             type: "url",
             url: o.ui.url
@@ -652,9 +652,9 @@ class sn {
 }
 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;
+  return s.createField(j(r, es), "Input", Nt(s, e.template)), s.createField(j(r, ts), "Input", tn(s, e.frontend)), s.lock(r), r;
 }
-function or(s, e) {
+function nr(s, e) {
   switch (e.type) {
     case "explicit":
       return on(s, e);
@@ -662,13 +662,13 @@ function or(s, e) {
       return M(e.type);
   }
 }
-function Je(s, e) {
+function Ge(s, e) {
   return { __isRef: !0, blockId: s, name: e };
 }
 function nn(s) {
   return typeof s == "object" && s !== null && s.__isRef === !0 && "blockId" in s && "name" in s;
 }
-function Et(s, e, t) {
+function Pt(s, e, t) {
   const r = typeof e;
   switch (r) {
     case "function":
@@ -684,10 +684,10 @@ function Et(s, e, t) {
       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) Et(s, o, t);
+        for (const o of e) Pt(s, o, t);
       else
         for (const [, o] of Object.entries(e))
-          Et(s, o, t);
+          Pt(s, o, t);
       return;
     default:
       M(r);
@@ -695,7 +695,7 @@ function Et(s, e, t) {
 }
 function an(s, e) {
   const t = { upstreams: /* @__PURE__ */ new Set(), missingReferences: !1 };
-  return Et(t, s, e), t;
+  return Pt(t, s, e), t;
 }
 function se(s) {
   return {
@@ -724,9 +724,9 @@ class rs {
     const n = new Set(o);
     for (; o.length > 0; ) {
       let i = [];
-      for (const c of o) {
-        const a = this.nodes.get(c);
-        r(a), a[e].forEach((l) => {
+      for (const a of o) {
+        const c = this.nodes.get(a);
+        r(c), c[e].forEach((l) => {
           n.has(l) || (n.add(l), i.push(l));
         });
       }
@@ -734,7 +734,7 @@ class rs {
     }
   }
 }
-function Pt(s) {
+function kt(s) {
   const e = /* @__PURE__ */ new Map();
   let t;
   for (const { id: r } of se(s)) {
@@ -746,19 +746,19 @@ function Pt(s) {
   }
   return t !== void 0 && (t.downstream = /* @__PURE__ */ new Set()), new rs(e);
 }
-function qe(s, e) {
+function ze(s, e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
   for (const { id: o } of se(s)) {
     const n = e(o);
     if (n === void 0) continue;
-    const i = an(n, r), c = {
+    const i = an(n, r), a = {
       id: o,
       missingReferences: i.missingReferences,
       upstream: i.upstreams,
       downstream: /* @__PURE__ */ new Set()
       // will be populated from downstream blocks
     };
-    t.set(o, c), i.upstreams.forEach((a) => t.get(a).downstream.add(o)), r.add(o);
+    t.set(o, a), i.upstreams.forEach((c) => t.get(c).downstream.add(o)), r.add(o);
   }
   return new rs(t);
 }
@@ -767,34 +767,34 @@ function cn(s, e) {
   for (const t of s) if (!e.has(t)) return !1;
   return !0;
 }
-function kt(s, e) {
-  if (s.size > e.size) return kt(e, s);
+function Ot(s, e) {
+  if (s.size > e.size) return Ot(e, s);
   for (const t of s) if (e.has(t)) return !0;
   return !1;
 }
-function nr(s, e) {
+function ir(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) : (!cn(n.upstream, i.upstream) || kt(n.upstream, o)) && o.add(n.id);
+    i === void 0 ? t.add(n.id) : (!cn(n.upstream, i.upstream) || Ot(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);
+    s.nodes.has(n.id) ? Ot(n.upstream, o) && o.add(n.id) : r.add(n.id);
   }), { onlyInA: t, onlyInB: r, different: o };
 }
-let ct;
+let lt;
 async function ss() {
-  if (ct === void 0) {
+  if (lt === 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");
-    ct = { spec: s, hash: e };
+    const e = De("sha256").update(s.content).digest("hex");
+    lt = { spec: s, hash: e };
   }
-  return ct;
+  return lt;
 }
 function ln(s, e, t) {
   return Xr(s, e, !0, { pf: t }, ["result"]).result;
 }
-function lt(s, e) {
+function ut(s, e) {
   let t = !1, r, o;
   return () => {
     if (!t)
@@ -803,13 +803,13 @@ function lt(s, e) {
     return r !== n && (r = n, o = e()), e();
   };
 }
-class ir {
+class ar {
   constructor(e, t) {
-    S(this, "currentInputsC", lt(
+    S(this, "currentInputsC", ut(
       () => this.fields.currentArgs.modCount,
       () => JSON.parse(Buffer.from(this.fields.currentArgs.value).toString())
     ));
-    S(this, "actualProductionInputsC", lt(
+    S(this, "actualProductionInputsC", ut(
       () => {
         var e;
         return (e = this.fields.prodArgs) == null ? void 0 : e.modCount;
@@ -821,7 +821,7 @@ class ir {
           return JSON.parse(Buffer.from(e).toString());
       }
     ));
-    S(this, "productionStaleC", lt(
+    S(this, "productionStaleC", ut(
       () => {
         var e;
         return `${this.fields.currentArgs.modCount}_${(e = this.fields.prodArgs) == null ? void 0 : e.modCount}`;
@@ -875,8 +875,8 @@ class ir {
 const un = (s) => {
   throw new Error(`No new block info for ${s}`);
 };
-class Ye {
-  constructor(e, t, r, o, n, i, c, a, l, u, d, f) {
+class Qe {
+  constructor(e, t, r, o, n, i, a, c, l, u, d, f) {
     S(this, "globalModCount", 0);
     S(this, "fieldsChanged", !1);
     //
@@ -895,7 +895,7 @@ class Ye {
     S(this, "stagingGraph");
     S(this, "pendingProductionGraph");
     S(this, "actualProductionGraph");
-    this.rid = e, this.tx = t, this.author = r, this.schema = o, this.lastModified = n, this.meta = i, this.struct = c, this.renderingState = a, this.blocksInLimbo = l, this.blockInfos = u, this.blockFrontendStates = d, this.ctxExportTplHolder = f;
+    this.rid = e, this.tx = t, this.author = r, this.schema = o, this.lastModified = n, this.meta = i, this.struct = a, this.renderingState = c, this.blocksInLimbo = l, this.blockInfos = u, this.blockFrontendStates = d, this.ctxExportTplHolder = f;
   }
   fixProblemsAndMigrate() {
     this.blockInfos.forEach((t) => {
@@ -903,7 +903,7 @@ class Ye {
     });
     let e;
     this.blockInfos.forEach((t) => {
-      t.fields.blockSettings === void 0 && (e === void 0 && (e = this.createJsonFieldValue(Wt)), this.setBlockFieldObj(t.id, "blockSettings", e));
+      t.fields.blockSettings === void 0 && (e === void 0 && (e = this.createJsonFieldValue(qt)), this.setBlockFieldObj(t.id, "blockSettings", e));
     });
   }
   get wasModified() {
@@ -913,16 +913,16 @@ class Ye {
     return JSON.parse(JSON.stringify(this.struct));
   }
   getStagingGraph() {
-    return this.stagingGraph === void 0 && (this.stagingGraph = Pt(this.struct)), this.stagingGraph;
+    return this.stagingGraph === void 0 && (this.stagingGraph = kt(this.struct)), this.stagingGraph;
   }
   getPendingProductionGraph() {
-    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = qe(
+    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = ze(
       this.struct,
       (e) => this.getBlockInfo(e).currentInputs
     )), this.pendingProductionGraph;
   }
   getActualProductionGraph() {
-    return this.actualProductionGraph === void 0 && (this.actualProductionGraph = qe(
+    return this.actualProductionGraph === void 0 && (this.actualProductionGraph = ze(
       this.struct,
       (e) => this.getBlockInfo(e).actualProductionInputs
     )), this.actualProductionGraph;
@@ -1000,8 +1000,8 @@ class Ye {
       JSON.parse(o);
       const i = Buffer.from(o);
       if (Buffer.compare(n.fields.currentArgs.value, i) === 0) continue;
-      const c = this.tx.createValue(L.JsonObject, i);
-      this.setBlockField(r, "currentArgs", c, "Ready", i), this.blocksWithChangedInputs.add(r), t.push(r);
+      const a = this.tx.createValue(L.JsonObject, i);
+      this.setBlockField(r, "currentArgs", a, "Ready", i), this.blocksWithChangedInputs.add(r), t.push(r);
     }
     this.getStagingGraph().traverse("downstream", t, ({ id: r }) => this.resetStaging(r)), t.length > 0 && this.updateLastModified();
   }
@@ -1042,7 +1042,7 @@ class Ye {
     this.resetStaging(e);
     const t = this.getBlockInfo(e), r = this.createCtx(this.getStagingGraph().nodes.get(e).upstream, "stagingCtx");
     if (this.getBlock(e).renderingMode !== "Heavy") throw new Error("not supported yet");
-    const o = t.getTemplate(this.tx), n = tr(this.tx, o, {
+    const o = t.getTemplate(this.tx), n = rr(this.tx, o, {
       args: t.fields.currentArgs.ref,
       blockId: this.tx.createValue(L.JsonString, JSON.stringify(e)),
       isProduction: this.tx.createValue(L.JsonBool, JSON.stringify(!1)),
@@ -1063,7 +1063,7 @@ class Ye {
     );
     if (this.getBlock(e).renderingMode === "Light")
       throw new Error("Can't render production for light block.");
-    const o = t.getTemplate(this.tx), n = tr(this.tx, o, {
+    const o = t.getTemplate(this.tx), n = rr(this.tx, o, {
       args: t.fields.currentArgs.ref,
       blockId: this.tx.createValue(L.JsonString, JSON.stringify(e)),
       isProduction: this.tx.createValue(L.JsonBool, JSON.stringify(!0)),
@@ -1081,31 +1081,31 @@ class Ye {
   //
   /** Very generic method, better check for more specialized case-specific methods first. */
   updateStructure(e, t = un) {
-    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = Pt(e), i = qe(
+    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = kt(e), i = ze(
       e,
       (l) => {
         var u;
         return (u = this.blockInfos.get(l)) == null ? void 0 : u.actualProductionInputs;
       }
-    ), c = nr(r, n), a = nr(o, i);
-    for (const l of c.onlyInA) {
+    ), a = ir(r, n), c = ir(o, i);
+    for (const l of a.onlyInA) {
       const { fields: u } = this.getBlockInfo(l);
       this.deleteBlockFields(l, ...Object.keys(u)), this.blockInfos.delete(l), this.blocksInLimbo.delete(l) && (this.renderingStateChanged = !0), this.blockFrontendStates.delete(l) && this.changedBlockFrontendStates.add(l);
     }
-    for (const l of c.onlyInB) {
-      const u = new ir(l, {});
+    for (const l of a.onlyInB) {
+      const u = new ar(l, {});
       this.blockInfos.set(l, u);
-      const d = t(l), f = or(this.tx, d.blockPack);
+      const d = t(l), f = nr(this.tx, d.blockPack);
       this.setBlockField(l, "blockPack", L.wrapInHolder(this.tx, f), "NotReady"), this.setBlockFieldObj(
         l,
         "blockSettings",
-        this.createJsonFieldValue(Wt)
+        this.createJsonFieldValue(qt)
       ), this.setBlockFieldObj(l, "currentArgs", this.createJsonFieldValueByContent(d.args)), d.uiState && (this.blockFrontendStates.set(l, d.uiState), this.changedBlockFrontendStates.add(l)), u.check();
     }
-    for (const l of c.different) this.resetStaging(l);
-    o.traverse("downstream", [...a.different], (l) => {
+    for (const l of a.different) this.resetStaging(l);
+    o.traverse("downstream", [...c.different], (l) => {
       this.resetOrLimboProduction(l.id);
-    }), (c.onlyInB.size > 0 || c.onlyInA.size > 0 || c.different.size > 0) && this.resetStagingRefreshTimestamp(), this.struct = e, this.structureChanged = !0, this.stagingGraph = void 0, this.pendingProductionGraph = void 0, this.actualProductionGraph = void 0, this.updateLastModified();
+    }), (a.onlyInB.size > 0 || a.onlyInA.size > 0 || a.different.size > 0) && this.resetStagingRefreshTimestamp(), this.struct = e, this.structureChanged = !0, this.stagingGraph = void 0, this.pendingProductionGraph = void 0, this.actualProductionGraph = void 0, this.updateLastModified();
   }
   //
   // Structure change helpers
@@ -1117,9 +1117,9 @@ class Ye {
     else {
       let n = !1;
       for (const i of o.groups) {
-        const c = i.blocks.findIndex((a) => a.id === r);
-        if (!(c < 0)) {
-          i.blocks.splice(c, 0, e), n = !0;
+        const a = i.blocks.findIndex((c) => c.id === r);
+        if (!(a < 0)) {
+          i.blocks.splice(a, 0, e), n = !0;
           break;
         }
       }
@@ -1151,7 +1151,7 @@ class Ye {
     this.setBlockField(
       e,
       "blockPack",
-      L.wrapInHolder(this.tx, or(this.tx, t)),
+      L.wrapInHolder(this.tx, nr(this.tx, t)),
       "NotReady"
     ), r !== void 0 ? (this.setArgs([{ blockId: e, args: r }]), this.setUiState(e, void 0)) : this.getStagingGraph().traverse("downstream", [e], ({ id: n }) => this.resetStaging(n)), o.productionRendered && this.getActualProductionGraph().traverse(
       "downstream",
@@ -1170,24 +1170,24 @@ class Ye {
       });
     else
       for (const i of r) {
-        const c = o.nodes.get(i);
-        if (c === void 0) throw new Error(`Can't find block with id: ${i}`);
-        for (const a of c.upstream)
-          if (!r.has(a))
+        const a = o.nodes.get(i);
+        if (a === void 0) throw new Error(`Can't find block with id: ${i}`);
+        for (const c of a.upstream)
+          if (!r.has(c))
             throw new Error("Can't render blocks not including all upstreams.");
       }
     const n = /* @__PURE__ */ new Set();
     for (const i of se(this.structure)) {
       if (!r.has(i.id)) continue;
-      let c = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
-      if (!c) {
-        for (const a of o.nodes.get(i.id).upstream)
-          if (n.has(a)) {
-            c = !0;
+      let a = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
+      if (!a) {
+        for (const c of o.nodes.get(i.id).upstream)
+          if (n.has(c)) {
+            a = !0;
             break;
           }
       }
-      c && (this.renderProductionFor(i.id), n.add(i.id));
+      a && (this.renderProductionFor(i.id), n.add(i.id));
     }
     return o.traverse("downstream", [...n], (i) => {
       n.has(i.id) || this.resetOrLimboProduction(i.id);
@@ -1196,26 +1196,26 @@ class Ye {
   /** Stops running blocks from the list and modify states of other blocks
    * accordingly */
   stopProduction(...e) {
-    var i, c;
+    var i, a;
     const t = this.getActualProductionGraph(), r = new Mr(e), o = new Set(e), n = [];
     for (; !r.isEmpty(); ) {
-      const a = r.shift(), l = this.getBlockInfo(a).fields;
-      if (!(((i = l.prodOutput) == null ? void 0 : i.status) === "Ready" && ((c = l.prodCtx) == null ? void 0 : c.status) === "Ready") && this.deleteBlockFields(a, "prodOutput", "prodCtx", "prodUiCtx", "prodArgs")) {
-        n.push(a);
-        for (const u of t.traverseIdsExcludingRoots("downstream", a))
+      const c = r.shift(), l = this.getBlockInfo(c).fields;
+      if (!(((i = l.prodOutput) == null ? void 0 : i.status) === "Ready" && ((a = l.prodCtx) == null ? void 0 : a.status) === "Ready") && this.deleteBlockFields(c, "prodOutput", "prodCtx", "prodUiCtx", "prodArgs")) {
+        n.push(c);
+        for (const u of t.traverseIdsExcludingRoots("downstream", c))
           o.has(u) || (r.push(u), o.add(u));
       }
     }
-    for (const a of t.traverseIdsExcludingRoots("downstream", ...n))
-      this.resetOrLimboProduction(a);
+    for (const c of t.traverseIdsExcludingRoots("downstream", ...n))
+      this.resetOrLimboProduction(c);
   }
   traverseWithStagingLag(e) {
     const t = /* @__PURE__ */ new Map();
     this.getStagingGraph().nodes.forEach((o) => {
       let i = this.getBlockInfo(o.id).stagingRendered ? 0 : 1;
-      o.upstream.forEach((c) => {
-        const a = t.get(c);
-        a !== 0 && (i = Math.max(a + 1, i));
+      o.upstream.forEach((a) => {
+        const c = t.get(a);
+        c !== 0 && (i = Math.max(c + 1, i));
       }), e(o.id, i), t.set(o.id, i);
     });
   }
@@ -1257,28 +1257,28 @@ class Ye {
   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, 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));
+      e === void 0 ? this.tx.deleteKValue(this.rid, Rt(t)) : this.tx.setKValue(this.rid, Rt(t), e);
+    (this.metaChanged || this.structureChanged) && (e === void 0 ? this.tx.deleteKValue(this.rid, Ct) : this.tx.setKValue(this.rid, Ct, 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.lastModifiedChanged && this.tx.setKValue(this.rid, Te, JSON.stringify(this.lastModified)), this.structureChanged && this.tx.setKValue(this.rid, pe, JSON.stringify(this.struct)), this.renderingStateChanged && this.tx.setKValue(
         this.rid,
-        Xe,
+        Ye,
         JSON.stringify({
           ...this.renderingState,
           blocksInLimbo: [...this.blocksInLimbo]
         })
-      ), this.metaChanged && this.tx.setKValue(this.rid, Te, JSON.stringify(this.meta));
+      ), this.metaChanged && this.tx.setKValue(this.rid, Le, JSON.stringify(this.meta));
       for (const e of this.changedBlockFrontendStates) {
         const t = this.blockFrontendStates.get(e);
-        t === void 0 ? this.tx.deleteKValue(this.rid, St(e)) : this.tx.setKValue(this.rid, St(e), t);
+        t === void 0 ? this.tx.deleteKValue(this.rid, bt(e)) : this.tx.setKValue(this.rid, bt(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, Xe), u = e.listKeyValuesString(t), [
+    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Wr), i = e.getKValueJson(t, Te), a = e.getKValueJson(t, Le), c = e.getKValueJson(t, pe), l = e.getKValueJson(t, Ye), u = e.listKeyValuesString(t), [
       d,
       f,
       h,
@@ -1290,8 +1290,8 @@ class Ye {
       o,
       n,
       i,
-      c,
       a,
+      c,
       l,
       u
     ]);
@@ -1307,14 +1307,14 @@ class Ye {
       m === void 0 && (m = {
         id: y.blockId,
         fields: {}
-      }, k.set(y.blockId, m)), m.fields[y.fieldName] = ze(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
+      }, k.set(y.blockId, m)), m.fields[y.fieldName] = Xe(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
     }
-    const oe = await ss(), he = Ct(oe.hash), T = d.fields.find(
+    const oe = await ss(), he = Et(oe.hash), T = d.fields.find(
       (p) => p.name === he
     );
     let q;
-    T !== void 0 ? q = yt(T.value) : (q = L.wrapInHolder(e, Lt(e, oe.spec)), e.createField(
-      j(t, Ct(oe.hash)),
+    T !== void 0 ? q = wt(T.value) : (q = L.wrapInHolder(e, Nt(e, oe.spec)), e.createField(
+      j(t, Et(oe.hash)),
       "Dynamic",
       q
     ));
@@ -1334,10 +1334,10 @@ class Ye {
     });
     for (const [p, y] of x) {
       const m = await y;
-      p.value = m.data, zt(m.error) ? p.status = "Error" : m.resourceReady || zt(m.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
+      p.value = m.data, Xt(m.error) ? p.status = "Error" : m.resourceReady || Xt(m.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
     }
     const z = /* @__PURE__ */ new Map();
-    k.forEach(({ id: p, fields: y }) => z.set(p, new ir(p, y)));
+    k.forEach(({ id: p, fields: y }) => z.set(p, new ar(p, y)));
     const fe = /* @__PURE__ */ new Set();
     for (const p of se(C)) {
       if (!z.has(p.id))
@@ -1349,7 +1349,7 @@ class Ye {
         throw new Error(`Inconsistent project structure: no structure entry for ${p.id}`);
       p.check();
     });
-    const v = new Ye(
+    const v = new Qe(
       t,
       e,
       r,
@@ -1370,25 +1370,25 @@ 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, 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));
+  s.setKValue(t, Wr, JSON.stringify(qr)), s.setKValue(t, Lt, r), s.setKValue(t, Te, r), s.setKValue(t, Le, JSON.stringify(e)), s.setKValue(t, pe, JSON.stringify(Co)), s.setKValue(t, Ye, JSON.stringify(Eo));
   const o = await ss();
   return s.createField(
-    j(t, Ct(o.hash)),
+    j(t, Et(o.hash)),
     "Dynamic",
-    L.wrapInHolder(s, Lt(s, o.spec))
+    L.wrapInHolder(s, Nt(s, o.spec))
   ), t;
 }
-async function Ge(s, e, t) {
+async function Me(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 Ye.load(o, e, t), i = await r(n);
+      const n = await Qe.load(o, e, t), i = await r(n);
       return n.wasModified && (n.save(), await o.commit()), i;
     });
   {
-    const o = await Ye.load(s, e, t), n = await r(o);
+    const o = await Qe.load(s, e, t), n = await r(o);
     return o.save(), n;
   }
 }
@@ -1407,7 +1407,7 @@ function* pn(s) {
       M(s);
   }
 }
-function ar(s, e) {
+function cr(s, e) {
   return Object.fromEntries(
     Object.entries(s).map(([t, r]) => [t, e(r, t)])
   );
@@ -1417,11 +1417,11 @@ function hn(s, e) {
     case "Json":
       return { ...s };
     case "JsonPartitioned":
-      return { ...s, parts: ar(s.parts, e) };
+      return { ...s, parts: cr(s.parts, e) };
     case "BinaryPartitioned":
       return {
         ...s,
-        parts: ar(s.parts, (t) => ({
+        parts: cr(s.parts, (t) => ({
           index: e(t.index),
           values: e(t.values)
         }))
@@ -1430,13 +1430,13 @@ function hn(s, e) {
       M(s);
   }
 }
-const fn = Le("PColumnData/JsonPartitioned", "1"), gn = Le(
+const fn = Ne("PColumnData/JsonPartitioned", "1"), gn = Ne(
   "PColumnData/Partitioned/JsonPartitioned",
   "1"
-), mn = Le("PColumnData/BinaryPartitioned", "1"), vn = Le(
+), mn = Ne("PColumnData/BinaryPartitioned", "1"), vn = Ne(
   "PColumnData/Partitioned/BinaryPartitioned",
   "1"
-), yn = Le("PColumnData/Json", "1");
+), yn = Ne("PColumnData/Json", "1");
 function wn(s) {
   if (!s.getIsReadyOrError()) throw new Error("Data not ready.");
   const e = s.getDataAsJson();
@@ -1463,9 +1463,12 @@ function wn(s) {
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
       if (i === void 0) throw new Error(`no partition keys for super key ${o}`);
-      for (const c of i) {
-        const a = JSON.stringify([...JSON.parse(o), ...JSON.parse(c)]);
-        r[a] = n.traverse({ field: c, errorIfFieldNotSet: !0 }).resourceInfo;
+      for (const a of i) {
+        const c = JSON.stringify([
+          ...JSON.parse(o),
+          ...JSON.parse(a)
+        ]);
+        r[c] = n.traverse({ field: a, errorIfFieldNotSet: !0 }).resourceInfo;
       }
     }
     return {
@@ -1499,22 +1502,28 @@ function wn(s) {
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
       if (i === void 0) throw new Error(`no partition keys for super key ${o}`);
-      for (const c of i)
-        if (c.endsWith(".index")) {
-          const a = c.slice(0, c.length - 6), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(a)]);
+      for (const a of i)
+        if (a.endsWith(".index")) {
+          const c = a.slice(0, a.length - 6), l = JSON.stringify([
+            ...JSON.parse(o),
+            ...JSON.parse(c)
+          ]);
           let u = r[l];
           u === void 0 && (u = {}, r[l] = u), r[l].index = n.traverse({
-            field: c,
+            field: a,
             errorIfFieldNotSet: !0
           }).resourceInfo;
-        } else if (c.endsWith(".values")) {
-          const a = c.slice(0, c.length - 7), l = JSON.stringify([...JSON.parse(o), ...JSON.parse(a)]);
+        } else if (a.endsWith(".values")) {
+          const c = a.slice(0, a.length - 7), l = JSON.stringify([
+            ...JSON.parse(o),
+            ...JSON.parse(c)
+          ]);
           let u = r[l];
           u === void 0 && (u = {}, r[l] = u), r[l].values = n.traverse({
-            field: c,
+            field: a,
             errorIfFieldNotSet: !0
           }).resourceInfo;
-        } else throw new Error(`unrecognized part field name: ${c}`);
+        } else throw new Error(`unrecognized part field name: ${a}`);
     }
     return {
       type: "BinaryPartitioned",
@@ -1538,17 +1547,17 @@ function Sn(s, e) {
   };
 }
 function bn(s, e) {
-  const t = Ne("sha256");
-  return t.update(re(s)), t.update(String(ze(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
+  const t = De("sha256");
+  return t.update(Q(s)), t.update(String(Xe(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
 }
-function cr(s, e) {
-  return re({ __isRef: !0, blockId: s, name: e });
+function lr(s, e) {
+  return Q({ __isRef: !0, blockId: s, name: e });
 }
 function Rn(s, e) {
-  return re({ resolvePath: s, name: e });
+  return Q({ resolvePath: s, name: e });
 }
 function os(s, e = !0, t = !1, r = "") {
-  var c, a, l;
+  var a, c, l;
   const o = /^(?<name>.*)\.(?<type>spec|data)$/, n = /* @__PURE__ */ new Map();
   for (const u of s.listInputFields()) {
     const d = u.match(o);
@@ -1556,13 +1565,13 @@ function os(s, e = !0, t = !1, r = "") {
       if (e) throw new Error(`unexpected field name ${u}`);
       continue;
     }
-    let f = B((c = d.groups) == null ? void 0 : c.name);
+    let f = B((a = d.groups) == null ? void 0 : a.name);
     if (!f.startsWith(r)) {
       if (e) throw new Error(`unexpected field name ${u}`);
       continue;
     }
     f = f.slice(r.length);
-    const h = B((a = d.groups) == null ? void 0 : a.type);
+    const h = B((c = d.groups) == null ? void 0 : c.type);
     let g = n.get(f);
     switch (g === void 0 && (g = {}, n.set(f, g)), h) {
       case "spec":
@@ -1591,22 +1600,22 @@ function Cn(s, e = !0, t = "", r) {
   const o = os(s, e, !1, t);
   Qs(o.locked);
   const n = {};
-  for (const [i, c] of o.results) {
-    if (c.spec === void 0) throw new Error(`no spec for key ${i}`);
-    if (c.hasData !== !0 || c.data === void 0)
+  for (const [i, a] of o.results) {
+    if (a.spec === void 0) throw new Error(`no spec for key ${i}`);
+    if (a.hasData !== !0 || a.data === void 0)
       throw new Error(`no data for key ${i}`);
-    const a = c.data();
-    if (a === void 0) throw new Error(`no data for key ${i}`);
-    if (!a.ok) throw new Hs(a.error);
+    const c = a.data();
+    if (c === void 0) throw new Error(`no data for key ${i}`);
+    if (!c.ok) throw new Hs(c.error);
     n[i] = {
-      id: r.length === 0 ? bn(c.spec, a.value) : Rn(r, i),
-      spec: c.spec,
-      data: a.value
+      id: r.length === 0 ? bn(a.spec, c.value) : Rn(r, i),
+      spec: a.spec,
+      data: c.value
     };
   }
   return n;
 }
-class Nt {
+class Dt {
   constructor(e, t) {
     S(this, "allSpecsAvailable");
     this.ctx = e, this.blocks = t;
@@ -1627,21 +1636,21 @@ class Nt {
     this.allSpecsAvailable = r;
   }
   getSpecByRef(e, t) {
-    var n, i, c, a, l, u;
+    var n, i, a, c, l, u;
     const r = this.blocks.get(e);
     if (r === void 0) return;
-    let o = (c = (i = (n = r.prod) == null ? void 0 : n.results) == null ? void 0 : i.get(t)) == null ? void 0 : c.spec;
-    if (o !== void 0 || (o = (u = (l = (a = r.staging) == null ? void 0 : a.results) == null ? void 0 : l.get(t)) == null ? void 0 : u.spec, o !== void 0)) return o;
+    let o = (a = (i = (n = r.prod) == null ? void 0 : n.results) == null ? void 0 : i.get(t)) == null ? void 0 : a.spec;
+    if (o !== void 0 || (o = (u = (l = (c = r.staging) == null ? void 0 : c.results) == null ? void 0 : l.get(t)) == null ? void 0 : u.spec, o !== void 0)) return o;
     r.staging === void 0 ? this.ctx.markUnstable(`staging_not_rendered:${e}`) : r.staging.locked ? r.prod !== void 0 && !r.prod.locked && this.ctx.markUnstable(`prod_not_locked:${e}`) : this.ctx.markUnstable(`staging_not_locked:${e}`);
   }
   getDataOrErrorByRef(e, t) {
-    var i, c, a;
+    var i, a, c;
     const r = this.blocks.get(e);
     if (r === void 0) return;
-    let o = (c = (i = r.prod) == null ? void 0 : i.results) == null ? void 0 : c.get(t), n = (a = o == null ? void 0 : o.data) == null ? void 0 : a.call(o);
+    let o = (a = (i = r.prod) == null ? void 0 : i.results) == null ? void 0 : a.get(t), n = (c = o == null ? void 0 : o.data) == null ? void 0 : c.call(o);
     if (o !== void 0 && o.spec !== void 0 && n !== void 0)
       return Br(n, (l) => ({
-        id: cr(e, t),
+        id: lr(e, t),
         spec: o.spec,
         data: l
       }));
@@ -1674,30 +1683,30 @@ class Nt {
     let t = !0, r;
     const o = (i) => {
       r === void 0 && (r = i), t = !1;
-    }, n = (i, c, a) => {
-      if (a.spec !== void 0 && a.hasData === !0 && a.data !== void 0) {
-        const l = a.data();
+    }, n = (i, a, c) => {
+      if (c.spec !== void 0 && c.hasData === !0 && c.data !== void 0) {
+        const l = c.data();
         l !== void 0 ? e.push({
-          ref: Je(i, c),
+          ref: Ge(i, a),
           obj: {
-            id: l.ok ? cr(i, c) : void 0,
-            spec: a.spec,
+            id: l.ok ? lr(i, a) : void 0,
+            spec: c.spec,
             data: l
           }
-        }) : o(`no_data:${i}:${c}`);
+        }) : o(`no_data:${i}:${a}`);
       }
     };
-    for (const [i, c] of this.blocks) {
-      const a = /* @__PURE__ */ new Set();
-      if (c.prod !== void 0) {
-        c.prod.locked || o(`prod_not_locked:${i}`);
-        for (const [l, u] of c.prod.results)
-          a.add(l), n(i, l, u);
+    for (const [i, a] of this.blocks) {
+      const c = /* @__PURE__ */ new Set();
+      if (a.prod !== void 0) {
+        a.prod.locked || o(`prod_not_locked:${i}`);
+        for (const [l, u] of a.prod.results)
+          c.add(l), n(i, l, u);
       }
-      if (c.staging !== void 0) {
-        c.staging.locked || o(`staging_not_locked:${i}`);
-        for (const [l, u] of c.staging.results)
-          a.has(l) || n(i, l, u);
+      if (a.staging !== void 0) {
+        a.staging.locked || o(`staging_not_locked:${i}`);
+        for (const [l, u] of a.staging.results)
+          c.has(l) || n(i, l, u);
       }
     }
     return { entries: e, isComplete: t, instabilityMarker: r };
@@ -1709,20 +1718,20 @@ class Nt {
       r === void 0 && (r = n), t = !1;
     };
     for (const [n, i] of this.blocks) {
-      const c = /* @__PURE__ */ new Set();
+      const a = /* @__PURE__ */ new Set();
       if (i.staging !== void 0) {
         i.staging.locked || o(`staging_not_locked:${n}`);
-        for (const [a, l] of i.staging.results)
+        for (const [c, l] of i.staging.results)
           l.spec !== void 0 && (e.push({
-            ref: Je(n, a),
+            ref: Ge(n, c),
             obj: l.spec
-          }), c.add(a));
+          }), a.add(c));
       } else o(`staging_not_rendered:${n}`);
       if (i.prod !== void 0) {
         i.prod.locked || o(`prod_not_locked:${n}`);
-        for (const [a, l] of i.prod.results)
-          c.has(a) || l.spec !== void 0 && e.push({
-            ref: Je(n, a),
+        for (const [c, l] of i.prod.results)
+          a.has(c) || l.spec !== void 0 && e.push({
+            ref: Ge(n, c),
             obj: l.spec
           });
       }
@@ -1733,11 +1742,11 @@ class Nt {
     const t = [];
     for (const r of this.blocks.values()) {
       const o = /* @__PURE__ */ new Set(), n = (i) => {
-        for (const [c, a] of i.results)
-          o.has(c) || a.spec === void 0 || (o.add(c), Ps(e, a.spec) && t.push({
-            label: r.info.label + " / " + c,
-            ref: Je(r.info.id, c),
-            spec: a.spec
+        for (const [a, c] of i.results)
+          o.has(a) || c.spec === void 0 || (o.add(a), Ps(e, c.spec) && t.push({
+            label: r.info.label + " / " + a,
+            ref: Ge(r.info.id, a),
+            spec: c.spec
           }));
       };
       r.staging !== void 0 && n(r.staging), r.prod !== void 0 && n(r.prod);
@@ -1745,10 +1754,10 @@ class Nt {
     return t;
   }
   static create(e, t, r) {
-    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(pe)), c = Pt(n).traverseIds("upstream", r), a = /* @__PURE__ */ new Map();
+    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(pe)), a = kt(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
     for (const l of se(n)) {
-      if (!c.has(l.id)) continue;
-      const u = lr(
+      if (!a.has(l.id)) continue;
+      const u = ur(
         o.traverse({
           field: V(l.id, "prodCtx"),
           ignoreError: !0,
@@ -1759,7 +1768,7 @@ class Nt {
           field: V(l.id, "prodUiCtx"),
           stableIfNotFound: !0
         })
-      ), d = lr(
+      ), d = ur(
         o.traverse({
           field: V(l.id, "stagingCtx"),
           ignoreError: !0,
@@ -1769,17 +1778,17 @@ class Nt {
           field: V(l.id, "stagingUiCtx")
         })
       );
-      a.set(l.id, { info: l, prod: u, staging: d });
+      c.set(l.id, { info: l, prod: u, staging: d });
     }
-    return new Nt(e, a);
+    return new Dt(e, c);
   }
 }
-function lr(s, e) {
+function ur(s, e) {
   if (e === void 0)
     return s ? { locked: !1, results: /* @__PURE__ */ new Map() } : void 0;
   if (e.ok) return os(e.value, !1, !0);
 }
-function Dt(s, e) {
+function Bt(s, e) {
   return {
     blockId: e,
     args: (n) => B(
@@ -1795,17 +1804,17 @@ function Dt(s, e) {
         stableIfNotFound: !0
       })) == null ? void 0 : i.getDataAsString();
     },
-    uiState: (n) => n.accessor(s).node().getKeyValueAsString(St(e)),
+    uiState: (n) => n.accessor(s).node().getKeyValueAsString(bt(e)),
     blockMeta: (n) => {
-      const i = n.accessor(s).node(), c = B(i.getKeyValueAsJson(pe)), a = /* @__PURE__ */ new Map();
-      for (const l of se(c)) a.set(l.id, l);
-      return a;
+      const i = n.accessor(s).node(), a = B(i.getKeyValueAsJson(pe)), c = /* @__PURE__ */ new Map();
+      for (const l of se(a)) c.set(l.id, l);
+      return c;
     }
   };
 }
 function ns(s, e) {
   return {
-    ...Dt(s, e),
+    ...Bt(s, e),
     prod: (t) => {
       var r;
       return (r = t.accessor(s).node({ ignoreError: !0 }).traverse({
@@ -1822,7 +1831,7 @@ function ns(s, e) {
       })) == null ? void 0 : o.persist();
       return r === void 0 && t.markUnstable("staging_not_rendered"), r;
     },
-    getResultsPool: (t) => Nt.create(t, s, e)
+    getResultsPool: (t) => Dt.create(t, s, e)
   };
 }
 function* W(s, e) {
@@ -1896,14 +1905,14 @@ function kn(s) {
   for (const e of W(s)) if (Pn(e)) return !0;
   return !1;
 }
-function Ze(s) {
+function et(s) {
   return {
     type: "ReturnResult",
     result: s
   };
 }
 function P(s) {
-  return () => Ze(s);
+  return () => et(s);
 }
 const On = (s) => {
   const e = {};
@@ -1920,7 +1929,7 @@ const On = (s) => {
   const e = s.source, t = s.field;
   return e === void 0 || t === void 0 ? P(void 0) : ({ cCtx: r }) => {
     var o;
-    return Ze((o = r.accessor(e).node().traverse(t)) == null ? void 0 : o.persist());
+    return et((o = r.accessor(e).node().traverse(t)) == null ? void 0 : o.persist());
   };
 };
 function is(s, e) {
@@ -1951,8 +1960,8 @@ function An(s, e) {
     if (r === void 0) return P(void 0);
     const o = {};
     for (const [n, i] of Object.entries(r)) {
-      const c = { ...s, [e.itVar]: i };
-      o[n] = $(c, e.mapping);
+      const a = { ...s, [e.itVar]: i };
+      o[n] = $(a, e.mapping);
     }
     return () => ({
       type: "ScheduleSubroutine",
@@ -1977,7 +1986,7 @@ const Tn = (s) => P(s), Ln = (s) => {
   const e = s.source;
   return e === void 0 ? P(void 0) : ({ cCtx: t }) => {
     var r;
-    return Ze((r = t.accessor(e).node()) == null ? void 0 : r.getDataAsJson());
+    return et((r = t.accessor(e).node()) == null ? void 0 : r.getDataAsJson());
   };
 }, xn = (s) => {
   const e = s.source, t = s.field;
@@ -1988,12 +1997,12 @@ function Vn(s, e) {
     const r = t.source;
     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] = P(void 0);
+      for (const a of n.listInputFields()) {
+        const c = n.traverse(a);
+        if (c === void 0) i[a] = P(void 0);
         else {
-          const l = { ...s, [e.itVar]: a.persist() };
-          i[c] = $(l, e.mapping);
+          const l = { ...s, [e.itVar]: c.persist() };
+          i[a] = $(l, e.mapping);
         }
       }
       return {
@@ -2092,7 +2101,7 @@ function $(s, e) {
   switch (e.type) {
     case "GetFromCtx":
       const t = s[e.variable];
-      return typeof t == "function" ? (r) => Ze(t(r.cCtx)) : P(t);
+      return typeof t == "function" ? (r) => et(t(r.cCtx)) : P(t);
     case "Isolate":
       return ({ drivers: r }) => ({
         type: "ScheduleComputable",
@@ -2308,29 +2317,29 @@ function ei(s) {
 function ti() {
   return { pendingSubroutines: /* @__PURE__ */ new Map() };
 }
-function ur(s, e, t, r) {
-  const o = new Mr(t), n = (c, a) => {
-    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");
-    return l.args[c.arg] = a, l.argCounter--, l.argCounter === 0 && (e.pendingSubroutines.delete(c.op), o.push({
+function dr(s, e, t, r) {
+  const o = new Mr(t), n = (a, c) => {
+    if (ei(a))
+      return e.result = c, !1;
+    const l = B(e.pendingSubroutines.get(a.op));
+    if (a.arg in l.args) throw new Error("argument already set");
+    return l.args[a.arg] = c, l.argCounter--, l.argCounter === 0 && (e.pendingSubroutines.delete(a.op), o.push({
       destination: l.destination,
       operation: l.subroutine(l.args)
     })), !0;
   }, i = [];
   e: for (; o.length > 0; ) {
-    const c = o.shift(), a = c.operation(s);
-    switch (a.type) {
+    const a = o.shift(), c = a.operation(s);
+    switch (c.type) {
       case "ReturnResult":
-        if (!n(c.destination, a.result)) break e;
+        if (!n(a.destination, c.result)) break e;
         break;
       case "ScheduleSubroutine":
-        const l = Symbol(), u = Object.entries(a.args), d = u.length;
+        const l = Symbol(), u = Object.entries(c.args), d = u.length;
         if (d === 0)
           o.push({
-            destination: c.destination,
-            operation: a.subroutine({})
+            destination: a.destination,
+            operation: c.subroutine({})
           });
         else {
           for (const [f, h] of u)
@@ -2341,8 +2350,8 @@ function ur(s, e, t, r) {
           e.pendingSubroutines.set(l, {
             argCounter: d,
             args: {},
-            subroutine: a.subroutine,
-            destination: c.destination
+            subroutine: c.subroutine,
+            destination: a.destination
           });
         }
         break;
@@ -2350,12 +2359,12 @@ function ur(s, e, t, r) {
         if (!r)
           throw new Error("asynchronous operations are forbidden in this context");
         i.push({
-          destination: c.destination,
-          computable: a.computable
+          destination: a.destination,
+          computable: c.computable
         });
         break;
       default:
-        M(a);
+        M(c);
     }
   }
   return i;
@@ -2364,7 +2373,7 @@ function ri(s, e, t, r = {}) {
   return us(s, Qn(e), t, r);
 }
 function us(s, e, t, r = {}) {
-  const o = `${e.blockId}#` + re({
+  const o = `${e.blockId}#` + Q({
     ctx: Object.fromEntries(
       Object.entries(e).filter(([n]) => Yn.indexOf(n) === -1)
     ),
@@ -2372,11 +2381,11 @@ function us(s, e, t, r = {}) {
   });
   return U.makeRaw(
     (n) => {
-      const i = { drivers: s, cCtx: n }, c = ti();
+      const i = { drivers: s, cCtx: n }, a = ti();
       return {
-        ir: ur(
+        ir: dr(
           i,
-          c,
+          a,
           [
             {
               destination: Zn,
@@ -2395,13 +2404,13 @@ function us(s, e, t, r = {}) {
               throw new Error("asynchronous operations are forbidden in this context");
             }
           }, f = /* @__PURE__ */ new Map();
-          for (const [g, C] of c.pendingSubroutines)
+          for (const [g, C] of a.pendingSubroutines)
             f.set(g, { ...C, args: { ...C.args } });
           const h = {
-            result: c.result,
+            result: a.result,
             pendingSubroutines: f
           };
-          if (ur(d, h, u, !1), !("result" in h))
+          if (dr(d, h, u, !1), !("result" in h))
             throw new Error("illegal cfg rendering stack state, no result");
           return h.result;
         }
@@ -2413,10 +2422,10 @@ function us(s, e, t, r = {}) {
 function si(s) {
   return s instanceof ArrayBuffer || ArrayBuffer.isView(s);
 }
-function dr(s) {
+function pr(s) {
   return s !== void 0 ? Buffer.from(s).toString("base64") : void 0;
 }
-class Qe {
+class Ze {
   constructor(e, t, r, o, n) {
     S(this, "callbackRegistry");
     S(this, "fnJSONStringify");
@@ -2448,12 +2457,12 @@ class Qe {
     try {
       this.vm.unwrapResult(this.vm.evalCode(e, "bundle.js", { type: "global" })).dispose();
     } catch (t) {
-      throw Qe.cleanErrorContext(t), t;
+      throw Ze.cleanErrorContext(t), t;
     }
   }
   runCallback(e, ...t) {
     try {
-      return wt.withScope((r) => {
+      return St.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}`);
@@ -2468,7 +2477,7 @@ class Qe {
         );
       });
     } catch (r) {
-      throw Qe.cleanErrorContext(r), r;
+      throw Ze.cleanErrorContext(r), r;
     }
   }
   //
@@ -2523,13 +2532,13 @@ class Qe {
     return this.getAccessor(e).listDynamicFields();
   }
   getKeyValueBase64(e, t) {
-    return dr(this.getAccessor(e).getKeyValue(t));
+    return pr(this.getAccessor(e).getKeyValue(t));
   }
   getKeyValueAsString(e, t) {
     return this.getAccessor(e).getKeyValueAsString(t);
   }
   getDataBase64(e) {
-    return dr(this.getAccessor(e).getData());
+    return pr(this.getAccessor(e).getData());
   }
   getDataAsString(e) {
     return this.getAccessor(e).getDataAsString();
@@ -2540,16 +2549,16 @@ class Qe {
   parsePObjectCollection(e, t, r, ...o) {
     const n = this.getAccessor(e);
     if (!n.getIsReadyOrError()) return;
-    const i = Cn(n, t, r, o), c = {};
-    for (const [a, l] of Object.entries(i))
-      c[a] = ue(l, (u) => this.wrapAccessor(u));
-    return c;
+    const i = Cn(n, t, r, o), a = {};
+    for (const [c, l] of Object.entries(i))
+      a[c] = ue(l, (u) => this.wrapAccessor(u));
+    return a;
   }
   //
   // Blobs
   //
   registerComputable(e, t) {
-    const r = `${e}_${Ie()}`;
+    const r = `${e}_${Ae()}`;
     return this.computablesToResolve[r] = t, r;
   }
   getBlobContentAsString(e) {
@@ -2718,7 +2727,7 @@ class Qe {
         "can't instantiate PTable from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPTable(
-      mt(
+      vt(
         e,
         (t) => ue(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
       ),
@@ -2742,7 +2751,7 @@ class Qe {
   }
   wrapAccessor(e) {
     if (e !== void 0) {
-      const t = Ie();
+      const t = Ae();
       return this.accessors.set(t, e), t;
     }
   }
@@ -2810,94 +2819,94 @@ class Qe {
       return JSON.parse(t);
   }
   injectCtx() {
-    wt.withScope((e) => {
+    St.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(ks.GlobalCfgRenderCtxFeatureFlags, e)
       );
-      const i = (c, a) => {
-        this.vm.newFunction(c, a).consume((l) => this.vm.setProp(t, c, l));
+      const i = (a, c) => {
+        this.vm.newFunction(a, c).consume((l) => this.vm.setProp(t, a, l));
       };
-      i("getAccessorHandleByName", (c) => this.exportSingleValue(
-        this.getAccessorHandleByName(this.vm.getString(c)),
+      i("getAccessorHandleByName", (a) => this.exportSingleValue(
+        this.getAccessorHandleByName(this.vm.getString(a)),
         void 0
-      )), i("resolveWithCommon", (c, a, ...l) => this.exportSingleValue(
+      )), i("resolveWithCommon", (a, c, ...l) => this.exportSingleValue(
         this.resolveWithCommon(
-          this.vm.getString(c),
-          this.importObjectViaJson(a),
+          this.vm.getString(a),
+          this.importObjectViaJson(c),
           ...l.map(
             (u) => this.importObjectViaJson(u)
           )
         ),
         void 0
-      )), i("getResourceType", (c) => this.exportObjectViaJson(this.getResourceType(this.vm.getString(c)), void 0)), i("getInputsLocked", (c) => this.exportSingleValue(this.getInputsLocked(this.vm.getString(c)), void 0)), i("getOutputsLocked", (c) => this.exportSingleValue(this.getOutputsLocked(this.vm.getString(c)), void 0)), i("getIsReadyOrError", (c) => this.exportSingleValue(this.getIsReadyOrError(this.vm.getString(c)), void 0)), i("getIsFinal", (c) => this.exportSingleValue(this.getIsFinal(this.vm.getString(c)), void 0)), i("getError", (c) => this.exportSingleValue(this.getError(this.vm.getString(c)), void 0)), i("listInputFields", (c) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(c)), void 0)), i("listOutputFields", (c) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(c)), void 0)), i("listDynamicFields", (c) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(c)), void 0)), i("getKeyValueBase64", (c, a) => this.exportSingleValue(
-        this.getKeyValueBase64(this.vm.getString(c), this.vm.getString(a)),
+      )), i("getResourceType", (a) => this.exportObjectViaJson(this.getResourceType(this.vm.getString(a)), void 0)), i("getInputsLocked", (a) => this.exportSingleValue(this.getInputsLocked(this.vm.getString(a)), void 0)), i("getOutputsLocked", (a) => this.exportSingleValue(this.getOutputsLocked(this.vm.getString(a)), void 0)), i("getIsReadyOrError", (a) => this.exportSingleValue(this.getIsReadyOrError(this.vm.getString(a)), void 0)), i("getIsFinal", (a) => this.exportSingleValue(this.getIsFinal(this.vm.getString(a)), void 0)), i("getError", (a) => this.exportSingleValue(this.getError(this.vm.getString(a)), void 0)), i("listInputFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("listOutputFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("listDynamicFields", (a) => this.exportObjectViaJson(this.listInputFields(this.vm.getString(a)), void 0)), i("getKeyValueBase64", (a, c) => this.exportSingleValue(
+        this.getKeyValueBase64(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), i("getKeyValueAsString", (c, a) => this.exportSingleValue(
-        this.getKeyValueAsString(this.vm.getString(c), this.vm.getString(a)),
+      )), i("getKeyValueAsString", (a, c) => this.exportSingleValue(
+        this.getKeyValueAsString(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), i("getDataBase64", (c) => this.exportSingleValue(this.getDataBase64(this.vm.getString(c)), void 0)), i("getDataAsString", (c) => this.exportSingleValue(this.getDataAsString(this.vm.getString(c)), void 0)), i(
+      )), i("getDataBase64", (a) => this.exportSingleValue(this.getDataBase64(this.vm.getString(a)), void 0)), i("getDataAsString", (a) => this.exportSingleValue(this.getDataAsString(this.vm.getString(a)), void 0)), i(
         "parsePObjectCollection",
-        (c, a, l, ...u) => this.exportObjectUniversal(
+        (a, c, l, ...u) => this.exportObjectUniversal(
           this.parsePObjectCollection(
-            this.vm.getString(c),
-            this.vm.dump(a),
+            this.vm.getString(a),
+            this.vm.dump(c),
             this.vm.getString(l),
             ...u.map(this.vm.getString)
           ),
           void 0
         )
-      ), i("getBlobContentAsBase64", (c) => this.exportSingleValue(
-        this.getBlobContentAsBase64(this.vm.getString(c)),
+      ), i("getBlobContentAsBase64", (a) => this.exportSingleValue(
+        this.getBlobContentAsBase64(this.vm.getString(a)),
         void 0
-      )), i("getBlobContentAsString", (c) => this.exportSingleValue(
-        this.getBlobContentAsString(this.vm.getString(c)),
+      )), i("getBlobContentAsString", (a) => this.exportSingleValue(
+        this.getBlobContentAsString(this.vm.getString(a)),
         void 0
-      )), i("getDownloadedBlobContentHandle", (c) => this.exportSingleValue(
-        this.getDownloadedBlobContentHandle(this.vm.getString(c)),
+      )), i("getDownloadedBlobContentHandle", (a) => this.exportSingleValue(
+        this.getDownloadedBlobContentHandle(this.vm.getString(a)),
         void 0
-      )), i("getOnDemandBlobContentHandle", (c) => this.exportSingleValue(
-        this.getOnDemandBlobContentHandle(this.vm.getString(c)),
+      )), i("getOnDemandBlobContentHandle", (a) => this.exportSingleValue(
+        this.getOnDemandBlobContentHandle(this.vm.getString(a)),
         void 0
-      )), i("extractArchiveAndGetURL", (c, a) => this.exportSingleValue(
-        this.extractArchiveAndGetURL(this.vm.getString(c), this.vm.getString(a)),
+      )), i("extractArchiveAndGetURL", (a, c) => this.exportSingleValue(
+        this.extractArchiveAndGetURL(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), i("getImportProgress", (c) => this.exportSingleValue(this.getImportProgress(this.vm.getString(c)), void 0)), i("getLastLogs", (c, a) => this.exportSingleValue(
-        this.getLastLogs(this.vm.getString(c), this.vm.getNumber(a)),
+      )), i("getImportProgress", (a) => this.exportSingleValue(this.getImportProgress(this.vm.getString(a)), void 0)), i("getLastLogs", (a, c) => this.exportSingleValue(
+        this.getLastLogs(this.vm.getString(a), this.vm.getNumber(c)),
         void 0
-      )), i("getProgressLog", (c, a) => this.exportSingleValue(
-        this.getProgressLog(this.vm.getString(c), this.vm.getString(a)),
+      )), i("getProgressLog", (a, c) => this.exportSingleValue(
+        this.getProgressLog(this.vm.getString(a), this.vm.getString(c)),
         void 0
-      )), i("getLogHandle", (c) => this.exportSingleValue(this.getLogHandle(this.vm.getString(c)), void 0)), i("getBlockLabel", (c) => this.exportSingleValue(this.getBlockLabel(this.vm.getString(c)), void 0)), i("getDataFromResultPool", (c) => this.exportObjectUniversal(this.getDataFromResultPool(), void 0)), i("getDataWithErrorsFromResultPool", (c) => this.exportObjectUniversal(this.getDataWithErrorsFromResultPool(), void 0)), i("getSpecsFromResultPool", (c) => this.exportObjectUniversal(this.getSpecsFromResultPool(), void 0)), i("calculateOptions", (c) => this.exportObjectUniversal(
-        this.calculateOptions(this.importObjectViaJson(c)),
+      )), i("getLogHandle", (a) => this.exportSingleValue(this.getLogHandle(this.vm.getString(a)), void 0)), i("getBlockLabel", (a) => this.exportSingleValue(this.getBlockLabel(this.vm.getString(a)), void 0)), i("getDataFromResultPool", (a) => this.exportObjectUniversal(this.getDataFromResultPool(), void 0)), i("getDataWithErrorsFromResultPool", (a) => this.exportObjectUniversal(this.getDataWithErrorsFromResultPool(), void 0)), i("getSpecsFromResultPool", (a) => this.exportObjectUniversal(this.getSpecsFromResultPool(), void 0)), i("calculateOptions", (a) => this.exportObjectUniversal(
+        this.calculateOptions(this.importObjectViaJson(a)),
         void 0
-      )), i("getSpecFromResultPoolByRef", (c, a) => this.exportObjectUniversal(
+      )), i("getSpecFromResultPoolByRef", (a, c) => this.exportObjectUniversal(
         this.getSpecFromResultPoolByRef(
-          this.vm.getString(c),
-          this.vm.getString(a)
+          this.vm.getString(a),
+          this.vm.getString(c)
         ),
         void 0
-      )), i("getDataFromResultPoolByRef", (c, a) => this.exportObjectUniversal(
+      )), i("getDataFromResultPoolByRef", (a, c) => this.exportObjectUniversal(
         this.getDataFromResultPoolByRef(
-          this.vm.getString(c),
-          this.vm.getString(a)
+          this.vm.getString(a),
+          this.vm.getString(c)
         ),
         void 0
-      )), i("createPFrame", (c) => this.exportSingleValue(
-        this.createPFrame(this.importObjectViaJson(c)),
+      )), i("createPFrame", (a) => this.exportSingleValue(
+        this.createPFrame(this.importObjectViaJson(a)),
         void 0
-      )), i("createPTable", (c) => this.exportSingleValue(
+      )), i("createPTable", (a) => this.exportSingleValue(
         this.createPTable(
-          this.importObjectViaJson(c)
+          this.importObjectViaJson(a)
         ),
         void 0
       )), i("getCurrentUnstableMarker", () => this.exportSingleValue(this.getCurrentUnstableMarker(), void 0)), this.vm.setProp(this.vm.global, "cfgRenderCtx", t);
     });
   }
 }
-function et(s, e) {
+function tt(s, e) {
   return Oe(
     s.traverse(
       {
@@ -2913,25 +2922,25 @@ function et(s, e) {
     }
   );
 }
-const Me = process.env.MI_LOG_OUTPUT_STATUS;
+const _e = 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 wt();
-    c.addOnDestroy(() => a.dispose());
-    const l = a.manage(s.quickJs.newRuntime());
+  return n = { ...n, key: i }, n.mode === void 0 && t.retentive === !0 && (n.mode = "StableOnlyRetentive"), U.makeRaw((a) => {
+    const c = new St();
+    a.addOnDestroy(() => c.dispose());
+    const l = c.manage(s.quickJs.newRuntime());
     l.setMemoryLimit(1024 * 640), l.setMaxStackSize(1024 * 320);
-    const u = a.manage(l.newContext()), d = new Qe(a, u, e, s, c);
+    const u = c.manage(l.newContext()), d = new Ze(c, u, e, s, a);
     d.evaluateBundle(r.content);
     const f = d.runCallback(t.handle);
     d.resetComputableCtx();
     let h = 0;
-    return Me && Me !== "unstable-only" && console.log(`Output ${t.handle} scaffold calculated.`), {
+    return _e && _e !== "unstable-only" && console.log(`Output ${t.handle} scaffold calculated.`), {
       ir: d.computablesToResolve,
       postprocessValue: async (g, { unstableMarker: C, stable: I }) => {
         for (const [K, k] of Object.entries(g)) d.runCallback(K, k);
         const N = d.importObjectUniversal(f);
-        return h++, Me && (Me !== "unstable-only" || !I) && console.log(
+        return h++, _e && (_e !== "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;
       }
@@ -2951,10 +2960,10 @@ function ii(s, e, t) {
   return U.make(
     (r) => {
       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)
+      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(Lt)), i = B(o.getKeyValueAsJson(Te)), a = B(o.getKeyValueAsJson(Le)), c = B(o.getKeyValueAsJson(pe)), l = B(
+        o.getKeyValueAsJson(Ye)
       ), u = /* @__PURE__ */ new Map();
-      for (const { id: T } of se(a)) {
+      for (const { id: T } of se(c)) {
         const q = o.traverse({
           field: V(T, "currentArgs"),
           assertFieldType: "Dynamic",
@@ -2987,17 +2996,17 @@ function ii(s, e, t) {
         }
         u.set(T, { currentArguments: q.getDataAsJson(), prod: ne });
       }
-      const d = qe(a, (T) => u.get(T).currentArguments), f = new Set(l.blocksInLimbo), h = [...se(a)].map(({ id: T, label: q, renderingMode: ne }) => {
+      const d = ze(c, (T) => u.get(T).currentArguments), f = new Set(l.blocksInLimbo), h = [...se(c)].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 = et(o, T), { sections: fe, title: v, inputsValid: p, sdkVersion: y } = Oe(z, ({ bpId: D, cfg: F, info: ge }) => {
-          const it = Dt(s, T);
+        const z = tt(o, T), { sections: fe, title: v, inputsValid: p, sdkVersion: y } = Oe(z, ({ bpId: D, cfg: F, info: ge }) => {
+          const at = Bt(s, T);
           return {
             sections: $e(
               t,
-              it,
+              at,
               F.sections,
               F.code,
               D
@@ -3006,7 +3015,7 @@ function ii(s, e, t) {
               F.title,
               (Rs) => $e(
                 t,
-                it,
+                at,
                 Rs,
                 F.code,
                 D
@@ -3014,7 +3023,7 @@ function ii(s, e, t) {
             ),
             inputsValid: $e(
               t,
-              it,
+              at,
               F.inputsValid,
               F.code,
               D
@@ -3053,10 +3062,10 @@ function ii(s, e, t) {
         };
       });
       return {
-        meta: c,
+        meta: a,
         created: new Date(n),
         lastModified: new Date(i),
-        authorMarker: o.getKeyValueAsJson(Rt),
+        authorMarker: o.getKeyValueAsJson(Ct),
         blocks: h
       };
     },
@@ -3068,10 +3077,10 @@ function ii(s, e, t) {
           blocks: r.blocks.map((i) => {
             var u, d;
             i.inputsValid || o.add(i.id), i.stale && n.add(i.id);
-            const c = i.stale || i.upstreams.findIndex((f) => n.has(f)) !== -1, a = (c || i.outputErrors) && !!i.inputsValid && !i.missingReference && i.upstreams.findIndex((f) => o.has(f)) === -1, l = {
+            const a = i.stale || i.upstreams.findIndex((f) => n.has(f)) !== -1, c = (a || i.outputErrors) && !!i.inputsValid && !i.missingReference && i.upstreams.findIndex((f) => o.has(f)) === -1, l = {
               ...i,
-              canRun: a,
-              stale: c,
+              canRun: c,
+              stale: a,
               updateSuggestions: ((u = i.updates) == null ? void 0 : u.suggestions) ?? [],
               updatedBlockPack: (d = i.updates) == null ? void 0 : d.mainSuggestion
             };
@@ -3117,15 +3126,15 @@ function ci(s, e) {
 function li(s, e, t) {
   return U.make(
     (r) => {
-      var c;
-      const o = r.accessor(s).node(), n = et(o, e), i = (c = o.traverse(
+      var a;
+      const o = r.accessor(s).node(), n = tt(o, e), i = (a = o.traverse(
         {
           field: V(e, "blockPack"),
           assertFieldType: "Dynamic"
         },
         { field: L.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 },
         { field: ts, assertFieldType: "Input" }
-      )) == null ? void 0 : c.persist();
+      )) == null ? void 0 : a.persist();
       return {
         path: ci(i, t),
         sdkVersion: n == null ? void 0 : n.cfg.sdkVersion
@@ -3139,9 +3148,9 @@ 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 = Dt(s, e), n = o.uiState(t);
+  const r = t.accessor(s).node(), o = Bt(s, e), n = o.uiState(t);
   return {
-    author: r.getKeyValueAsJson(bt(e)),
+    author: r.getKeyValueAsJson(Rt(e)),
     args: JSON.parse(o.args(t)),
     ui: n !== void 0 ? JSON.parse(n) : void 0
   };
@@ -3150,13 +3159,13 @@ function ui(s, e, t) {
   return U.make(
     (r) => {
       const o = r.accessor(s).node(), n = ns(s, e);
-      return Oe(et(o, e), ({ cfg: i, bpId: c }) => {
-        const a = {};
+      return Oe(tt(o, e), ({ cfg: i, bpId: a }) => {
+        const c = {};
         for (const [l, u] of Object.entries(i.outputs)) {
-          const d = $e(t, n, u, i.code, c);
-          a[l] = U.wrapError(d);
+          const d = $e(t, n, u, i.code, a);
+          c[l] = U.wrapError(d);
         }
-        return a;
+        return c;
       });
     },
     { key: "outputs#" + Jr(s.rid) + "#" + e }
@@ -3165,15 +3174,15 @@ function ui(s, e, t) {
 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 se(o)) {
-      const a = et(r, i);
-      if (a === void 0) continue;
-      const l = Object.entries(a.cfg.outputs).map(([, d]) => d).filter((d) => ni(d)).map((d) => d);
+    for (const { id: i, renderingMode: a } of se(o)) {
+      const c = tt(r, i);
+      if (c === void 0) continue;
+      const l = Object.entries(c.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)
         n.push(
-          U.wrapError($e(e, u, d, a.cfg.code, a.bpId))
+          U.wrapError($e(e, u, d, c.cfg.code, c.bpId))
         );
     }
     return n;
@@ -3186,14 +3195,14 @@ class pi {
   setState(e, t) {
     const r = this.states.get(e);
     if (r === void 0) {
-      this.states.set(e, { state: t, change: new Yt() });
+      this.states.set(e, { state: t, change: new Qt() });
       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 Yt() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
+    return r === void 0 && (r = { state: { ...Os }, change: new Qt() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
   }
   getState(e) {
     return U.make(
@@ -3206,7 +3215,7 @@ class pi {
     t !== void 0 && (this.states.delete(e), t.change.markChanged());
   }
 }
-class Bt {
+class jt {
   constructor(e, t, r) {
     /** Underlying pl resource id */
     S(this, "rid");
@@ -3228,7 +3237,7 @@ class Bt {
   async refreshLoop() {
     for (; !this.destroyed; )
       try {
-        await Ge(this.env.pl, this.rid, (e) => {
+        await Me(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) {
@@ -3252,8 +3261,8 @@ class Bt {
    *
    * @return returns newly created block id
    * */
-  async addBlock(e, t, r, o = void 0, n = Ie()) {
-    const i = await this.env.bpPreparer.prepare(t), c = await this.env.bpPreparer.getBlockConfigContainer(t), a = jr(c);
+  async addBlock(e, t, r, o = void 0, n = Ae()) {
+    const i = await this.env.bpPreparer.prepare(t), a = await this.env.bpPreparer.getBlockConfigContainer(t), c = jr(a);
     return await Y(
       this.env.pl,
       this.rid,
@@ -3262,11 +3271,11 @@ class Bt {
         {
           id: n,
           label: e,
-          renderingMode: a.renderingMode
+          renderingMode: c.renderingMode
         },
         {
-          args: JSON.stringify(a.initialArgs),
-          uiState: JSON.stringify(a.initialUiState),
+          args: JSON.stringify(c.initialArgs),
+          uiState: JSON.stringify(c.initialUiState),
           blockPack: i
         },
         r
@@ -3283,7 +3292,7 @@ class Bt {
       this.env.pl,
       this.rid,
       o,
-      (c) => c.migrateBlockPack(
+      (a) => a.migrateBlockPack(
         e,
         n,
         r ? JSON.stringify(i.initialArgs) : void 0
@@ -3314,10 +3323,10 @@ class Bt {
           {
             id: n.id,
             label: n.label,
-            blocks: e.map((c) => {
-              const a = n.blocks.find((l) => l.id === c);
-              if (a === void 0) throw new Error(`Can't find block: ${c}`);
-              return a;
+            blocks: e.map((a) => {
+              const c = n.blocks.find((l) => l.id === a);
+              if (c === void 0) throw new Error(`Can't find block: ${a}`);
+              return c;
             })
           }
         ]
@@ -3331,7 +3340,7 @@ class Bt {
    * stale state.
    * */
   async runBlock(e) {
-    await Ge(this.env.pl, this.rid, (t) => t.renderProduction([e], !0)), await this.projectTree.refreshState();
+    await Me(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
@@ -3339,7 +3348,7 @@ class Bt {
    * calculated.
    * */
   async stopBlock(e) {
-    await Ge(this.env.pl, this.rid, (t) => t.stopProduction(e)), await this.projectTree.refreshState();
+    await Me(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) {
@@ -3402,15 +3411,15 @@ class Bt {
   /** 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 = yt(
+      const o = wt(
         (await r.getField(j(this.rid, V(e, "blockPack")))).value
-      ), n = yt(
+      ), n = wt(
         (await r.getField(j(o, L.HolderRefField))).value
-      ), i = await r.getResourceData(n, !1), c = JSON.parse(
+      ), i = await r.getResourceData(n, !1), a = JSON.parse(
         Buffer.from(B(i.data)).toString("utf-8")
       );
-      await Y(r, this.rid, t, (a) => {
-        a.setArgs([{ blockId: e, args: JSON.stringify(c.config.initialArgs) }]), a.setUiState(e, void 0);
+      await Y(r, this.rid, t, (c) => {
+        c.setArgs([{ blockId: e, args: JSON.stringify(a.config.initialArgs) }]), c.setUiState(e, void 0);
       }), await r.commit();
     }), await this.projectTree.refreshState();
   }
@@ -3471,7 +3480,7 @@ class Bt {
     await this.destroy();
   }
   static async init(e, t) {
-    await Ge(e.pl, t, (o) => {
+    await Me(e.pl, t, (o) => {
     });
     const r = await Gr.init(
       e.pl,
@@ -3482,7 +3491,7 @@ class Bt {
       },
       e.logger
     );
-    return new Bt(e, t, r);
+    return new jt(e, t, r);
   }
 }
 function hi(s) {
@@ -3546,7 +3555,7 @@ function gi(s) {
 function mi(s) {
   return s && s.__esModule && Object.prototype.hasOwnProperty.call(s, "default") ? s.default : s;
 }
-var Ot = { exports: {} };
+var $t = { exports: {} };
 const vi = "2.0.0", fs = 256, yi = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
 9007199254740991, wi = 16, Si = fs - 6, bi = [
   "major",
@@ -3557,7 +3566,7 @@ const vi = "2.0.0", fs = 256, yi = Number.MAX_SAFE_INTEGER || /* istanbul ignore
   "prepatch",
   "prerelease"
 ];
-var tt = {
+var rt = {
   MAX_LENGTH: fs,
   MAX_SAFE_COMPONENT_LENGTH: wi,
   MAX_SAFE_BUILD_LENGTH: Si,
@@ -3569,15 +3578,15 @@ var tt = {
 };
 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 rt = Ri;
+var st = Ri;
 (function(s, e) {
   const {
     MAX_SAFE_COMPONENT_LENGTH: t,
     MAX_SAFE_BUILD_LENGTH: r,
     MAX_LENGTH: o
-  } = tt, n = rt;
+  } = rt, n = st;
   e = s.exports = {};
-  const i = e.re = [], c = e.safeRe = [], a = e.src = [], l = e.t = {};
+  const i = e.re = [], a = e.safeRe = [], c = e.src = [], l = e.t = {};
   let u = 0;
   const d = "[a-zA-Z0-9-]", f = [
     ["\\s", 1],
@@ -3589,48 +3598,48 @@ var rt = Ri;
     return C;
   }, g = (C, I, N) => {
     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);
+    n(C, k, I), l[C] = k, c[k] = I, i[k] = new RegExp(I, N ? "g" : void 0), a[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*$");
-})(Ot, Ot.exports);
-var De = Ot.exports;
+  g("NUMERICIDENTIFIER", "0|[1-9]\\d*"), g("NUMERICIDENTIFIERLOOSE", "\\d+"), g("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${d}*`), g("MAINVERSION", `(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})\\.(${c[l.NUMERICIDENTIFIER]})`), g("MAINVERSIONLOOSE", `(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})\\.(${c[l.NUMERICIDENTIFIERLOOSE]})`), g("PRERELEASEIDENTIFIER", `(?:${c[l.NUMERICIDENTIFIER]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASEIDENTIFIERLOOSE", `(?:${c[l.NUMERICIDENTIFIERLOOSE]}|${c[l.NONNUMERICIDENTIFIER]})`), g("PRERELEASE", `(?:-(${c[l.PRERELEASEIDENTIFIER]}(?:\\.${c[l.PRERELEASEIDENTIFIER]})*))`), g("PRERELEASELOOSE", `(?:-?(${c[l.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${c[l.PRERELEASEIDENTIFIERLOOSE]})*))`), g("BUILDIDENTIFIER", `${d}+`), g("BUILD", `(?:\\+(${c[l.BUILDIDENTIFIER]}(?:\\.${c[l.BUILDIDENTIFIER]})*))`), g("FULLPLAIN", `v?${c[l.MAINVERSION]}${c[l.PRERELEASE]}?${c[l.BUILD]}?`), g("FULL", `^${c[l.FULLPLAIN]}$`), g("LOOSEPLAIN", `[v=\\s]*${c[l.MAINVERSIONLOOSE]}${c[l.PRERELEASELOOSE]}?${c[l.BUILD]}?`), g("LOOSE", `^${c[l.LOOSEPLAIN]}$`), g("GTLT", "((?:<|>)?=?)"), g("XRANGEIDENTIFIERLOOSE", `${c[l.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`), g("XRANGEIDENTIFIER", `${c[l.NUMERICIDENTIFIER]}|x|X|\\*`), g("XRANGEPLAIN", `[v=\\s]*(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:\\.(${c[l.XRANGEIDENTIFIER]})(?:${c[l.PRERELEASE]})?${c[l.BUILD]}?)?)?`), g("XRANGEPLAINLOOSE", `[v=\\s]*(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:\\.(${c[l.XRANGEIDENTIFIERLOOSE]})(?:${c[l.PRERELEASELOOSE]})?${c[l.BUILD]}?)?)?`), g("XRANGE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAIN]}$`), g("XRANGELOOSE", `^${c[l.GTLT]}\\s*${c[l.XRANGEPLAINLOOSE]}$`), g("COERCEPLAIN", `(^|[^\\d])(\\d{1,${t}})(?:\\.(\\d{1,${t}}))?(?:\\.(\\d{1,${t}}))?`), g("COERCE", `${c[l.COERCEPLAIN]}(?:$|[^\\d])`), g("COERCEFULL", c[l.COERCEPLAIN] + `(?:${c[l.PRERELEASE]})?(?:${c[l.BUILD]})?(?:$|[^\\d])`), g("COERCERTL", c[l.COERCE], !0), g("COERCERTLFULL", c[l.COERCEFULL], !0), g("LONETILDE", "(?:~>?)"), g("TILDETRIM", `(\\s*)${c[l.LONETILDE]}\\s+`, !0), e.tildeTrimReplace = "$1~", g("TILDE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAIN]}$`), g("TILDELOOSE", `^${c[l.LONETILDE]}${c[l.XRANGEPLAINLOOSE]}$`), g("LONECARET", "(?:\\^)"), g("CARETTRIM", `(\\s*)${c[l.LONECARET]}\\s+`, !0), e.caretTrimReplace = "$1^", g("CARET", `^${c[l.LONECARET]}${c[l.XRANGEPLAIN]}$`), g("CARETLOOSE", `^${c[l.LONECARET]}${c[l.XRANGEPLAINLOOSE]}$`), g("COMPARATORLOOSE", `^${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]})$|^$`), g("COMPARATOR", `^${c[l.GTLT]}\\s*(${c[l.FULLPLAIN]})$|^$`), g("COMPARATORTRIM", `(\\s*)${c[l.GTLT]}\\s*(${c[l.LOOSEPLAIN]}|${c[l.XRANGEPLAIN]})`, !0), e.comparatorTrimReplace = "$1$2$3", g("HYPHENRANGE", `^\\s*(${c[l.XRANGEPLAIN]})\\s+-\\s+(${c[l.XRANGEPLAIN]})\\s*$`), g("HYPHENRANGELOOSE", `^\\s*(${c[l.XRANGEPLAINLOOSE]})\\s+-\\s+(${c[l.XRANGEPLAINLOOSE]})\\s*$`), g("STAR", "(<|>)?=?\\s*\\*"), g("GTE0", "^\\s*>=\\s*0\\.0\\.0\\s*$"), g("GTE0PRE", "^\\s*>=\\s*0\\.0\\.0-0\\s*$");
+})($t, $t.exports);
+var Be = $t.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);
+var xt = Pi;
+const hr = /^[0-9]+$/, gs = (s, e) => {
+  const t = hr.test(s), r = hr.test(e);
   return t && r && (s = +s, e = +e), s === e ? 0 : t && !r ? -1 : r && !t ? 1 : s < e ? -1 : 1;
 }, ki = (s, e) => gs(e, s);
 var ms = {
   compareIdentifiers: gs,
   rcompareIdentifiers: ki
 };
-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 {
+const Ke = st, { MAX_LENGTH: fr, MAX_SAFE_INTEGER: He } = rt, { safeRe: gr, t: mr } = Be, Oi = xt, { compareIdentifiers: me } = ms;
+let $i = class te {
   constructor(e, t) {
-    if (t = Oi(t), e instanceof ee) {
+    if (t = Oi(t), e instanceof te) {
       if (e.loose === !!t.loose && e.includePrerelease === !!t.includePrerelease)
         return e;
       e = e.version;
     } else if (typeof e != "string")
       throw new TypeError(`Invalid version. Must be a string. Got type "${typeof e}".`);
-    if (e.length > hr)
+    if (e.length > fr)
       throw new TypeError(
-        `version is longer than ${hr} characters`
+        `version is longer than ${fr} characters`
       );
-    _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]);
+    Ke("SemVer", e, t), this.options = t, this.loose = !!t.loose, this.includePrerelease = !!t.includePrerelease;
+    const r = e.trim().match(t.loose ? gr[mr.LOOSE] : gr[mr.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 > Ke || this.major < 0)
+    if (this.raw = e, this.major = +r[1], this.minor = +r[2], this.patch = +r[3], this.major > He || this.major < 0)
       throw new TypeError("Invalid major version");
-    if (this.minor > Ke || this.minor < 0)
+    if (this.minor > He || this.minor < 0)
       throw new TypeError("Invalid minor version");
-    if (this.patch > Ke || this.patch < 0)
+    if (this.patch > He || 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 < Ke)
+        if (n >= 0 && n < He)
           return n;
       }
       return o;
@@ -3643,18 +3652,18 @@ let $i = class ee {
     return this.version;
   }
   compare(e) {
-    if (_e("SemVer.compare", this.version, this.options, e), !(e instanceof ee)) {
+    if (Ke("SemVer.compare", this.version, this.options, e), !(e instanceof te)) {
       if (typeof e == "string" && e === this.version)
         return 0;
-      e = new ee(e, this.options);
+      e = new te(e, this.options);
     }
     return e.version === this.version ? 0 : this.compareMain(e) || this.comparePre(e);
   }
   compareMain(e) {
-    return e instanceof ee || (e = new ee(e, this.options)), me(this.major, e.major) || me(this.minor, e.minor) || me(this.patch, e.patch);
+    return e instanceof te || (e = new te(e, this.options)), me(this.major, e.major) || me(this.minor, e.minor) || me(this.patch, e.patch);
   }
   comparePre(e) {
-    if (e instanceof ee || (e = new ee(e, this.options)), this.prerelease.length && !e.prerelease.length)
+    if (e instanceof te || (e = new te(e, this.options)), this.prerelease.length && !e.prerelease.length)
       return -1;
     if (!this.prerelease.length && e.prerelease.length)
       return 1;
@@ -3663,7 +3672,7 @@ let $i = class ee {
     let t = 0;
     do {
       const r = this.prerelease[t], o = e.prerelease[t];
-      if (_e("prerelease compare", t, r, o), r === void 0 && o === void 0)
+      if (Ke("prerelease compare", t, r, o), r === void 0 && o === void 0)
         return 0;
       if (o === void 0)
         return 1;
@@ -3675,11 +3684,11 @@ let $i = class ee {
     } while (++t);
   }
   compareBuild(e) {
-    e instanceof ee || (e = new ee(e, this.options));
+    e instanceof te || (e = new te(e, this.options));
     let t = 0;
     do {
       const r = this.build[t], o = e.build[t];
-      if (_e("build compare", t, r, o), r === void 0 && o === void 0)
+      if (Ke("build compare", t, r, o), r === void 0 && o === void 0)
         return 0;
       if (o === void 0)
         return 1;
@@ -3744,11 +3753,11 @@ let $i = class ee {
   }
 };
 var _ = $i;
-const mr = _, Fi = (s, e, t = !1) => {
-  if (s instanceof mr)
+const vr = _, Fi = (s, e, t = !1) => {
+  if (s instanceof vr)
     return s;
   try {
-    return new mr(s, e);
+    return new vr(s, e);
   } catch (r) {
     if (!t)
       return null;
@@ -3766,11 +3775,11 @@ const Li = Se, Ni = (s, e) => {
   return t ? t.version : null;
 };
 var Di = Ni;
-const vr = _, Bi = (s, e, t, r, o) => {
+const yr = _, Bi = (s, e, t, r, o) => {
   typeof t == "string" && (o = r, r = t, t = void 0);
   try {
-    return new vr(
-      s instanceof vr ? s.version : s,
+    return new yr(
+      s instanceof yr ? s.version : s,
       t
     ).inc(e, r, o).version;
   } catch {
@@ -3778,14 +3787,14 @@ const vr = _, Bi = (s, e, t, r, o) => {
   }
 };
 var ji = Bi;
-const yr = Se, xi = (s, e) => {
-  const t = yr(s, null, !0), r = yr(e, null, !0), o = t.compare(r);
+const wr = Se, xi = (s, e) => {
+  const t = wr(s, null, !0), r = wr(e, null, !0), o = t.compare(r);
   if (o === 0)
     return null;
-  const n = o > 0, i = n ? t : r, c = n ? r : t, a = !!i.prerelease.length;
-  if (!!c.prerelease.length && !a)
-    return !c.patch && !c.minor ? "major" : i.patch ? "patch" : i.minor ? "minor" : "major";
-  const u = a ? "pre" : "";
+  const n = o > 0, i = n ? t : r, a = n ? r : t, c = !!i.prerelease.length;
+  if (!!a.prerelease.length && !c)
+    return !a.patch && !a.minor ? "major" : i.patch ? "patch" : i.minor ? "minor" : "major";
+  const u = c ? "pre" : "";
   return t.major !== r.major ? u + "major" : t.minor !== r.minor ? u + "minor" : t.patch !== r.patch ? u + "patch" : "prerelease";
 };
 var Vi = xi;
@@ -3800,34 +3809,34 @@ const zi = Se, Xi = (s, e) => {
   return t && t.prerelease.length ? t.prerelease : null;
 };
 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);
+const Sr = _, Qi = (s, e, t) => new Sr(s, t).compare(new Sr(e, t));
+var Z = Qi;
+const Zi = Z, ea = (s, e, t) => Zi(e, s, t);
 var ta = ea;
-const ra = Q, sa = (s, e) => ra(s, e, !0);
+const ra = Z, 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);
+const br = _, na = (s, e, t) => {
+  const r = new br(s, t), o = new br(e, t);
   return r.compare(o) || r.compareBuild(o);
 };
-var xt = na;
-const ia = xt, aa = (s, e) => s.sort((t, r) => ia(t, r, e));
+var Vt = na;
+const ia = Vt, 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));
+const la = Vt, 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;
+const pa = Z, ha = (s, e, t) => pa(s, e, t) > 0;
+var ot = ha;
+const fa = Z, ga = (s, e, t) => fa(s, e, t) < 0;
+var Ut = ga;
+const ma = Z, va = (s, e, t) => ma(s, e, t) === 0;
 var vs = va;
-const ya = Q, wa = (s, e, t) => ya(s, e, t) !== 0;
+const ya = Z, 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) => {
+const Sa = Z, ba = (s, e, t) => Sa(s, e, t) >= 0;
+var Jt = ba;
+const Ra = Z, Ca = (s, e, t) => Ra(s, e, t) <= 0;
+var Gt = Ca;
+const Ea = vs, Pa = ys, ka = ot, Oa = Jt, $a = Ut, Fa = Gt, Ia = (s, e, t, r) => {
   switch (e) {
     case "===":
       return typeof s == "object" && (s = s.version), typeof t == "object" && (t = t.version), s === t;
@@ -3852,7 +3861,7 @@ const Ea = vs, Pa = ys, ka = st, Oa = Ut, $a = Vt, Fa = Jt, Ia = (s, e, t, r) =>
   }
 };
 var ws = Ia;
-const Aa = _, Ta = Se, { safeRe: He, t: We } = De, La = (s, e) => {
+const Aa = _, Ta = Se, { safeRe: We, t: qe } = Be, La = (s, e) => {
   if (s instanceof Aa)
     return s;
   if (typeof s == "number" && (s = String(s)), typeof s != "string")
@@ -3860,18 +3869,18 @@ const Aa = _, Ta = Se, { safeRe: He, t: We } = De, La = (s, e) => {
   e = e || {};
   let t = null;
   if (!e.rtl)
-    t = s.match(e.includePrerelease ? He[We.COERCEFULL] : He[We.COERCE]);
+    t = s.match(e.includePrerelease ? We[qe.COERCEFULL] : We[qe.COERCE]);
   else {
-    const a = e.includePrerelease ? He[We.COERCERTLFULL] : He[We.COERCERTL];
+    const c = e.includePrerelease ? We[qe.COERCERTLFULL] : We[qe.COERCERTL];
     let l;
-    for (; (l = a.exec(s)) && (!t || t.index + t[0].length !== s.length); )
-      (!t || l.index + l[0].length !== t.index + t[0].length) && (t = l), a.lastIndex = l.index + l[1].length + l[2].length;
-    a.lastIndex = -1;
+    for (; (l = c.exec(s)) && (!t || t.index + t[0].length !== s.length); )
+      (!t || l.index + l[0].length !== t.index + t[0].length) && (t = l), c.lastIndex = l.index + l[1].length + l[2].length;
+    c.lastIndex = -1;
   }
   if (t === null)
     return null;
-  const r = t[2], o = t[3] || "0", n = t[4] || "0", i = e.includePrerelease && t[5] ? `-${t[5]}` : "", c = e.includePrerelease && t[6] ? `+${t[6]}` : "";
-  return Ta(`${r}.${o}.${n}${i}${c}`, e);
+  const r = t[2], o = t[3] || "0", n = t[4] || "0", i = e.includePrerelease && t[5] ? `-${t[5]}` : "", a = e.includePrerelease && t[6] ? `+${t[6]}` : "";
+  return Ta(`${r}.${o}.${n}${i}${a}`, e);
 };
 var Na = La;
 class Da {
@@ -3897,10 +3906,10 @@ class Da {
     return this;
   }
 }
-var Ba = Da, ut, br;
-function Z() {
-  if (br) return ut;
-  br = 1;
+var Ba = Da, dt, Rr;
+function ee() {
+  if (Rr) return dt;
+  Rr = 1;
   const s = /\s+/g;
   class e {
     constructor(p, y) {
@@ -3946,10 +3955,10 @@ function Z() {
       const m = ((this.options.includePrerelease && h) | (this.options.loose && g)) + ":" + p, b = r.get(m);
       if (b)
         return b;
-      const w = this.options.loose, R = w ? a[l.HYPHENRANGELOOSE] : a[l.HYPHENRANGE];
-      p = p.replace(R, z(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(a[l.COMPARATORTRIM], u), i("comparator trim", p), p = p.replace(a[l.TILDETRIM], d), i("tilde trim", p), p = p.replace(a[l.CARETTRIM], f), i("caret trim", p);
+      const w = this.options.loose, R = w ? c[l.HYPHENRANGELOOSE] : c[l.HYPHENRANGE];
+      p = p.replace(R, z(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[l.COMPARATORTRIM], u), i("comparator trim", p), p = p.replace(c[l.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[l.CARETTRIM], f), i("caret trim", p);
       let O = p.split(" ").map((F) => K(F, this.options)).join(" ").split(/\s+/).map((F) => x(F, this.options));
-      w && (O = O.filter((F) => (i("loose invalid filter", F, this.options), !!F.match(a[l.COMPARATORLOOSE])))), i("range list", O);
+      w && (O = O.filter((F) => (i("loose invalid filter", F, this.options), !!F.match(c[l.COMPARATORLOOSE])))), i("range list", O);
       const E = /* @__PURE__ */ new Map(), A = O.map((F) => new n(F, this.options));
       for (const F of A) {
         if (C(F))
@@ -3971,7 +3980,7 @@ function Z() {
         return !1;
       if (typeof p == "string")
         try {
-          p = new c(p, this.options);
+          p = new a(p, this.options);
         } catch {
           return !1;
         }
@@ -3981,14 +3990,14 @@ function Z() {
       return !1;
     }
   }
-  ut = e;
-  const t = Ba, r = new t(), o = jt, n = ot(), i = rt, c = _, {
-    safeRe: a,
+  dt = e;
+  const t = Ba, r = new t(), o = xt, n = nt(), i = st, a = _, {
+    safeRe: c,
     t: l,
     comparatorTrimReplace: u,
     tildeTrimReplace: d,
     caretTrimReplace: f
-  } = De, { FLAG_INCLUDE_PRERELEASE: h, FLAG_LOOSE: g } = tt, C = (v) => v.value === "<0.0.0-0", I = (v) => v.value === "", N = (v, p) => {
+  } = Be, { FLAG_INCLUDE_PRERELEASE: h, FLAG_LOOSE: g } = rt, 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();
@@ -3996,7 +4005,7 @@ function Z() {
       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 = 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];
+    const y = p.loose ? c[l.TILDELOOSE] : c[l.TILDE];
     return v.replace(y, (m, b, w, R, O) => {
       i("tilde", v, m, b, w, R, O);
       let E;
@@ -4004,7 +4013,7 @@ function Z() {
     });
   }, T = (v, p) => v.trim().split(/\s+/).map((y) => q(y, p)).join(" "), q = (v, p) => {
     i("caret", v, p);
-    const y = p.loose ? a[l.CARETLOOSE] : a[l.CARET], m = p.includePrerelease ? "-0" : "";
+    const y = p.loose ? c[l.CARETLOOSE] : c[l.CARET], m = p.includePrerelease ? "-0" : "";
     return v.replace(y, (b, w, R, O, E) => {
       i("caret", v, b, w, R, O, E);
       let A;
@@ -4012,13 +4021,13 @@ function Z() {
     });
   }, 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];
+    const y = p.loose ? c[l.XRANGELOOSE] : c[l.XRANGE];
     return v.replace(y, (m, b, w, R, O, E) => {
       i("xRange", v, m, b, w, R, O, E);
       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) => (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) => {
+  }, J = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[l.STAR], "")), x = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? l.GTE0PRE : l.GTE0], "")), 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;
@@ -4033,12 +4042,12 @@ function Z() {
     }
     return !0;
   };
-  return ut;
+  return dt;
 }
-var dt, Rr;
-function ot() {
-  if (Rr) return dt;
-  Rr = 1;
+var pt, Cr;
+function nt() {
+  if (Cr) return pt;
+  Cr = 1;
   const s = Symbol("SemVer ANY");
   class e {
     static get ANY() {
@@ -4056,7 +4065,7 @@ function ot() {
       const d = this.options.loose ? r[o.COMPARATORLOOSE] : r[o.COMPARATOR], f = u.match(d);
       if (!f)
         throw new TypeError(`Invalid comparator: ${u}`);
-      this.operator = f[1] !== void 0 ? f[1] : "", this.operator === "=" && (this.operator = ""), f[2] ? this.semver = new c(f[2], this.options.loose) : this.semver = s;
+      this.operator = f[1] !== void 0 ? f[1] : "", this.operator === "=" && (this.operator = ""), f[2] ? this.semver = new a(f[2], this.options.loose) : this.semver = s;
     }
     toString() {
       return this.value;
@@ -4066,7 +4075,7 @@ function ot() {
         return !0;
       if (typeof u == "string")
         try {
-          u = new c(u, this.options);
+          u = new a(u, this.options);
         } catch {
           return !1;
         }
@@ -4075,14 +4084,14 @@ function ot() {
     intersects(u, d) {
       if (!(u instanceof e))
         throw new TypeError("a Comparator is required");
-      return this.operator === "" ? this.value === "" ? !0 : new a(u.value, d).test(this.value) : u.operator === "" ? u.value === "" ? !0 : new a(this.value, d).test(u.semver) : (d = t(d), d.includePrerelease && (this.value === "<0.0.0-0" || u.value === "<0.0.0-0") || !d.includePrerelease && (this.value.startsWith("<0.0.0") || u.value.startsWith("<0.0.0")) ? !1 : !!(this.operator.startsWith(">") && u.operator.startsWith(">") || this.operator.startsWith("<") && u.operator.startsWith("<") || this.semver.version === u.semver.version && this.operator.includes("=") && u.operator.includes("=") || n(this.semver, "<", u.semver, d) && this.operator.startsWith(">") && u.operator.startsWith("<") || n(this.semver, ">", u.semver, d) && this.operator.startsWith("<") && u.operator.startsWith(">")));
+      return this.operator === "" ? this.value === "" ? !0 : new c(u.value, d).test(this.value) : u.operator === "" ? u.value === "" ? !0 : new c(this.value, d).test(u.semver) : (d = t(d), d.includePrerelease && (this.value === "<0.0.0-0" || u.value === "<0.0.0-0") || !d.includePrerelease && (this.value.startsWith("<0.0.0") || u.value.startsWith("<0.0.0")) ? !1 : !!(this.operator.startsWith(">") && u.operator.startsWith(">") || this.operator.startsWith("<") && u.operator.startsWith("<") || this.semver.version === u.semver.version && this.operator.includes("=") && u.operator.includes("=") || n(this.semver, "<", u.semver, d) && this.operator.startsWith(">") && u.operator.startsWith("<") || n(this.semver, ">", u.semver, d) && this.operator.startsWith("<") && u.operator.startsWith(">")));
     }
   }
-  dt = e;
-  const t = jt, { safeRe: r, t: o } = De, n = ws, i = rt, c = _, a = Z();
-  return dt;
+  pt = e;
+  const t = xt, { safeRe: r, t: o } = Be, n = ws, i = st, a = _, c = ee();
+  return pt;
 }
-const ja = Z(), xa = (s, e, t) => {
+const ja = ee(), xa = (s, e, t) => {
   try {
     e = new ja(e, t);
   } catch {
@@ -4090,10 +4099,10 @@ const ja = Z(), xa = (s, e, t) => {
   }
   return e.test(s);
 };
-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 it = xa;
+const Va = ee(), 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) => {
+const Ga = _, Ma = ee(), _a = (s, e, t) => {
   let r = null, o = null, n = null;
   try {
     n = new Ma(e, t);
@@ -4105,7 +4114,7 @@ const Ga = _, Ma = Z(), _a = (s, e, t) => {
   }), r;
 };
 var Ka = _a;
-const Ha = _, Wa = Z(), qa = (s, e, t) => {
+const Ha = _, Wa = ee(), qa = (s, e, t) => {
   let r = null, o = null, n = null;
   try {
     n = new Wa(e, t);
@@ -4117,23 +4126,23 @@ const Ha = _, Wa = Z(), qa = (s, e, t) => {
   }), r;
 };
 var za = qa;
-const pt = _, Xa = Z(), Cr = st, Ya = (s, e) => {
+const ht = _, Xa = ee(), Er = ot, 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)))
+  let t = new ht("0.0.0");
+  if (s.test(t) || (t = new ht("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 pt(i.semver.version);
+      const a = new ht(i.semver.version);
       switch (i.operator) {
         case ">":
-          c.prerelease.length === 0 ? c.patch++ : c.prerelease.push(0), c.raw = c.format();
+          a.prerelease.length === 0 ? a.patch++ : a.prerelease.push(0), a.raw = a.format();
         case "":
         case ">=":
-          (!n || Cr(c, n)) && (n = c);
+          (!n || Er(a, n)) && (n = a);
           break;
         case "<":
         case "<=":
@@ -4141,12 +4150,12 @@ const pt = _, Xa = Z(), Cr = st, Ya = (s, e) => {
         default:
           throw new Error(`Unexpected operation: ${i.operator}`);
       }
-    }), n && (!t || Cr(t, n)) && (t = n);
+    }), n && (!t || Er(t, n)) && (t = n);
   }
   return t && s.test(t) ? t : null;
 };
 var Qa = Ya;
-const Za = Z(), ec = (s, e) => {
+const Za = ee(), ec = (s, e) => {
   try {
     return new Za(s, e).range || "*";
   } catch {
@@ -4154,15 +4163,15 @@ const Za = Z(), ec = (s, e) => {
   }
 };
 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) => {
+const rc = _, Ss = nt(), { ANY: sc } = Ss, oc = ee(), nc = it, Pr = ot, kr = Ut, ic = Gt, ac = Jt, cc = (s, e, t, r) => {
   s = new rc(s, r), e = new oc(e, r);
-  let o, n, i, c, a;
+  let o, n, i, a, c;
   switch (t) {
     case ">":
-      o = Er, n = ic, i = Pr, c = ">", a = ">=";
+      o = Pr, n = ic, i = kr, a = ">", c = ">=";
       break;
     case "<":
-      o = Pr, n = ac, i = Er, c = "<", a = "<=";
+      o = kr, n = ac, i = Pr, a = "<", c = "<=";
       break;
     default:
       throw new TypeError('Must provide a hilo val of "<" or ">"');
@@ -4174,21 +4183,21 @@ const rc = _, Ss = ot(), { ANY: sc } = Ss, oc = Z(), nc = nt, Er = st, Pr = Vt,
     let d = null, f = null;
     if (u.forEach((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))
+    }), d.operator === a || d.operator === c || (!f.operator || f.operator === a) && n(s, f.semver))
       return !1;
-    if (f.operator === a && i(s, f.semver))
+    if (f.operator === c && i(s, f.semver))
       return !1;
   }
   return !0;
 };
-var Gt = cc;
-const lc = Gt, uc = (s, e, t) => lc(s, e, ">", t);
+var Mt = cc;
+const lc = Mt, uc = (s, e, t) => lc(s, e, ">", t);
 var dc = uc;
-const pc = Gt, hc = (s, e, t) => pc(s, e, "<", t);
+const pc = Mt, 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));
+const Or = ee(), gc = (s, e, t) => (s = new Or(s, t), e = new Or(e, t), s.intersects(e, t));
 var mc = gc;
-const vc = nt, yc = Q;
+const vc = it, yc = Z;
 var wc = (s, e, t) => {
   const r = [];
   let o = null, n = null;
@@ -4196,16 +4205,16 @@ var wc = (s, e, t) => {
   for (const u of i)
     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 = [];
+  const a = [];
   for (const [u, d] of r)
-    u === d ? c.push(u) : !d && u === i[0] ? c.push("*") : d ? u === i[0] ? c.push(`<=${d}`) : c.push(`${u} - ${d}`) : c.push(`>=${u}`);
-  const a = c.join(" || "), l = typeof e.raw == "string" ? e.raw : String(e);
-  return a.length < l.length ? a : e;
+    u === d ? a.push(u) : !d && u === i[0] ? a.push("*") : d ? u === i[0] ? a.push(`<=${d}`) : a.push(`${u} - ${d}`) : a.push(`>=${u}`);
+  const c = a.join(" || "), l = typeof e.raw == "string" ? e.raw : String(e);
+  return c.length < l.length ? c : e;
 };
-const Or = Z(), Mt = ot(), { ANY: ht } = Mt, Re = nt, _t = Q, Sc = (s, e, t = {}) => {
+const $r = ee(), _t = nt(), { ANY: ft } = _t, Re = it, Kt = Z, Sc = (s, e, t = {}) => {
   if (s === e)
     return !0;
-  s = new Or(s, t), e = new Or(e, t);
+  s = new $r(s, t), e = new $r(e, t);
   let r = !1;
   e: for (const o of s.set) {
     for (const n of e.set) {
@@ -4217,28 +4226,28 @@ const Or = Z(), Mt = ot(), { ANY: ht } = Mt, Re = nt, _t = Q, Sc = (s, e, t = {}
       return !1;
   }
   return !0;
-}, bc = [new Mt(">=0.0.0-0")], $r = [new Mt(">=0.0.0")], Rc = (s, e, t) => {
+}, bc = [new _t(">=0.0.0-0")], Fr = [new _t(">=0.0.0")], Rc = (s, e, t) => {
   if (s === e)
     return !0;
-  if (s.length === 1 && s[0].semver === ht) {
-    if (e.length === 1 && e[0].semver === ht)
+  if (s.length === 1 && s[0].semver === ft) {
+    if (e.length === 1 && e[0].semver === ft)
       return !0;
-    t.includePrerelease ? s = bc : s = $r;
+    t.includePrerelease ? s = bc : s = Fr;
   }
-  if (e.length === 1 && e[0].semver === ht) {
+  if (e.length === 1 && e[0].semver === ft) {
     if (t.includePrerelease)
       return !0;
-    e = $r;
+    e = Fr;
   }
   const r = /* @__PURE__ */ new Set();
   let o, n;
   for (const h of s)
-    h.operator === ">" || h.operator === ">=" ? o = Fr(o, h, t) : h.operator === "<" || h.operator === "<=" ? n = Ir(n, h, t) : r.add(h.semver);
+    h.operator === ">" || h.operator === ">=" ? o = Ir(o, h, t) : h.operator === "<" || h.operator === "<=" ? n = Ar(n, h, t) : r.add(h.semver);
   if (r.size > 1)
     return null;
   let i;
   if (o && n) {
-    if (i = _t(o.semver, n.semver, t), i > 0)
+    if (i = Kt(o.semver, n.semver, t), i > 0)
       return null;
     if (i === 0 && (o.operator !== ">=" || n.operator !== "<="))
       return null;
@@ -4251,19 +4260,19 @@ const Or = Z(), Mt = ot(), { ANY: ht } = Mt, Re = nt, _t = Q, Sc = (s, e, t = {}
         return !1;
     return !0;
   }
-  let c, a, l, u, d = n && !t.includePrerelease && n.semver.prerelease.length ? n.semver : !1, f = o && !t.includePrerelease && o.semver.prerelease.length ? o.semver : !1;
+  let a, c, l, u, d = n && !t.includePrerelease && n.semver.prerelease.length ? n.semver : !1, f = o && !t.includePrerelease && o.semver.prerelease.length ? o.semver : !1;
   d && d.prerelease.length === 1 && n.operator === "<" && d.prerelease[0] === 0 && (d = !1);
   for (const h of e) {
     if (u = u || h.operator === ">" || h.operator === ">=", l = l || h.operator === "<" || h.operator === "<=", o) {
       if (f && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === f.major && h.semver.minor === f.minor && h.semver.patch === f.patch && (f = !1), h.operator === ">" || h.operator === ">=") {
-        if (c = Fr(o, h, t), c === h && c !== o)
+        if (a = Ir(o, h, t), a === h && a !== o)
           return !1;
       } else if (o.operator === ">=" && !Re(o.semver, String(h), t))
         return !1;
     }
     if (n) {
       if (d && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === d.major && h.semver.minor === d.minor && h.semver.patch === d.patch && (d = !1), h.operator === "<" || h.operator === "<=") {
-        if (a = Ir(n, h, t), a === h && a !== n)
+        if (c = Ar(n, h, t), c === h && c !== n)
           return !1;
       } else if (n.operator === "<=" && !Re(n.semver, String(h), t))
         return !1;
@@ -4272,19 +4281,19 @@ const Or = Z(), Mt = ot(), { ANY: ht } = Mt, Re = nt, _t = Q, Sc = (s, e, t = {}
       return !1;
   }
   return !(o && l && !n && i !== 0 || n && u && !o && i !== 0 || f || d);
-}, Fr = (s, e, t) => {
+}, Ir = (s, e, t) => {
   if (!s)
     return e;
-  const r = _t(s.semver, e.semver, t);
+  const r = Kt(s.semver, e.semver, t);
   return r > 0 ? s : r < 0 || e.operator === ">" && s.operator === ">=" ? e : s;
-}, Ir = (s, e, t) => {
+}, Ar = (s, e, t) => {
   if (!s)
     return e;
-  const r = _t(s.semver, e.semver, t);
+  const r = Kt(s.semver, e.semver, t);
   return r < 0 ? s : r > 0 || e.operator === "<" && s.operator === "<=" ? e : s;
 };
 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;
+const gt = Be, Tr = rt, Ec = _, Lr = ms, Pc = Se, kc = Ti, Oc = Di, $c = ji, Fc = Vi, Ic = Gi, Ac = Ki, Tc = qi, Lc = Yi, Nc = Z, Dc = ta, Bc = oa, jc = Vt, xc = ca, Vc = da, Uc = ot, Jc = Ut, Gc = vs, Mc = ys, _c = Jt, Kc = Gt, Hc = ws, Wc = Na, qc = nt(), zc = ee(), Xc = it, Yc = Ja, Qc = Ka, Zc = za, el = Qa, tl = tc, rl = Mt, sl = dc, ol = fc, nl = mc, il = wc, al = Cc;
 var cl = {
   parse: Pc,
   valid: kc,
@@ -4324,13 +4333,13 @@ var cl = {
   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
+  re: gt.re,
+  src: gt.src,
+  tokens: gt.t,
+  SEMVER_SPEC_VERSION: Tr.SEMVER_SPEC_VERSION,
+  RELEASE_TYPES: Tr.RELEASE_TYPES,
+  compareIdentifiers: Lr.compareIdentifiers,
+  rcompareIdentifiers: Lr.rcompareIdentifiers
 };
 const ll = /* @__PURE__ */ mi(cl), ul = {
   minDelay: 1500
@@ -4349,7 +4358,7 @@ class pl extends qs {
       case "dev-v2":
         return `dev_2_${t.currentSpec.folder}_${t.currentSpec.mtime}`;
       case "from-registry-v2":
-        return `from_registry_v2_${re(t)}`;
+        return `from_registry_v2_${Q(t)}`;
       default:
         return dl;
     }
@@ -4368,31 +4377,31 @@ class pl extends qs {
           }
         case "dev-v2":
           try {
-            const i = await vt(n.folder, this.logger);
+            const i = await yt(n.folder, this.logger);
             if (i === void 0) return { suggestions: [] };
-            const c = await At(i);
-            return c === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: c }, suggestions: [] };
+            const a = await Tt(i);
+            return a === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: a }, suggestions: [] };
           } catch (i) {
             return this.logger.warn(i), { suggestions: [] };
           }
         case "from-registry-v2":
           try {
-            const { versionLock: i, skipVersion: c } = t.settings;
+            const { versionLock: i, skipVersion: a } = t.settings;
             if (i === "patch") return { suggestions: [] };
-            const a = this.registryProvider.getRegistry(n.registryUrl);
+            const c = this.registryProvider.getRegistry(n.registryUrl);
             let l, u = this.preferredUpdateChannel;
             if (u === void 0)
               if (n.channel === void 0)
-                if (await a.getLatestOverview(n.id, ae)) u = ae;
+                if (await c.getLatestOverview(n.id, ae)) u = ae;
                 else {
-                  if (await a.getLatestOverview(n.id, we) === void 0)
+                  if (await c.getLatestOverview(n.id, we) === void 0)
                     return this.logger.error(
                       `No "any" channel record for ${Fs(n.id)}`
                     ), { suggestions: [] };
                   u = we;
                 }
               else u = n.channel;
-            const d = await a.getUpdateSuggestions(n.id, u);
+            const d = await c.getUpdateSuggestions(n.id, u);
             if (d === void 0 || d.length === 0) return { suggestions: [] };
             d.reverse();
             let f;
@@ -4412,7 +4421,7 @@ class pl extends qs {
               update: { ...n, id: { ...n.id, version: I } }
             }));
             if (f === void 0) return { suggestions: h };
-            if (c !== void 0 && ll.lte(f, c))
+            if (a !== void 0 && ll.lte(f, a))
               return { suggestions: h };
             const g = {
               ...n,
@@ -4420,7 +4429,7 @@ class pl extends qs {
             };
             return (async () => {
               try {
-                await a.getComponents(g.id);
+                await c.getComponents(g.id);
               } catch (C) {
                 this.logger.warn(C);
               }
@@ -4436,10 +4445,10 @@ class pl extends qs {
     }
   }
   resultsEqual(t, r) {
-    return re(t) === re(r);
+    return Q(t) === Q(r);
   }
 }
-class Lr {
+class Nr {
   constructor() {
     S(this, "resources", /* @__PURE__ */ new Map());
   }
@@ -4475,17 +4484,17 @@ class Lr {
   }
 }
 let Ce;
-function te() {
+function re() {
   return Ce || (Ce = {
     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) {
+function Fe(s) {
   return String(s.id);
 }
 const hl = ["Int", "Long", "Float", "Double", "String", "Bytes"];
-function gt(s) {
+function mt(s) {
   const e = [], t = [];
   for (const r of s)
     r.type === "bySingleColumn" ? (e.push(r), t.push({
@@ -4524,55 +4533,72 @@ class fl {
         throw console.log(`resolveBlobContent catched error: ${r}`), t;
       }
     });
-    this.blobDriver = e, this.logger = t, this.blobContentCache = r, this.columns = o;
-    const n = (a, l) => {
-      switch (a) {
+    this.blobDriver = e, this.logger = t, this.blobContentCache = r;
+    const n = (l, u) => {
+      switch (l) {
         default:
         case "info":
-          return this.logger.info(l);
+          return this.logger.info(u);
         case "warn":
-          return this.logger.warn(l);
+          return this.logger.warn(u);
         case "error":
-          return this.logger.error(l);
+          return this.logger.error(u);
       }
     };
-    for (const a of o)
-      for (const l of pn(a.data))
-        this.blobIdToResource.set(Nr(l), l);
-    const i = () => {
-      if (te().usePFrameRs) {
-        const a = new po(te().logPFrameRequests ? n : void 0);
-        for (const l of o)
-          a.addColumnSpec(l.id, l.spec);
-        return a;
-      } else {
-        const a = te().logPFrameRequests ? new Ve(n) : new Ve();
-        for (const l of o)
+    for (const l of o)
+      for (const u of pn(l.data))
+        this.blobIdToResource.set(Fe(u), u);
+    const i = [
+      ...new Map(o.map((l) => ({
+        ...l,
+        data: hn(l.data, Fe)
+      })).map(
+        (l) => [Q(l), l]
+      )).values()
+    ], a = () => {
+      try {
+        if (re().usePFrameRs) {
+          const l = new po(re().logPFrameRequests ? n : void 0);
+          for (const u of i)
+            l.addColumnSpec(u.id, u.spec);
+          return l;
+        } else {
+          const l = re().logPFrameRequests ? new Ue(n) : new Ue();
+          for (const u of i)
+            try {
+              l.addColumnSpec(u.id, u.spec);
+            } catch (d) {
+              throw new Error(
+                `Adding column ${u.id} to PFrame failed: ${d}; Spec: ${JSON.stringify(u.spec)}.`
+              );
+            }
+          return l;
+        }
+      } catch (l) {
+        throw new Error(
+          `Spec PFrame creation failed, columns: ${JSON.stringify(i)}, error: ${l}`
+        );
+      }
+    }, c = () => {
+      try {
+        const l = re().logPFrameRequests ? new Ue(n) : new Ue();
+        l.setDataSource(this);
+        for (const u of i)
           try {
-            a.addColumnSpec(l.id, l.spec);
-          } catch (u) {
+            l.addColumnSpec(u.id, u.spec), l.setColumnData(u.id, u.data);
+          } catch (d) {
             throw new Error(
-              `Adding column ${l.id} to PFrame failed: ${u}; Spec: ${JSON.stringify(l.spec)}.`
+              `Adding column ${u.id} to PFrame failed: ${d}; Spec: ${JSON.stringify(u.spec)}, DataInfo: ${JSON.stringify(u.data)}.`
             );
           }
-        return a;
-      }
-    }, c = () => {
-      const a = te().logPFrameRequests ? new Ve(n) : new Ve();
-      a.setDataSource(this);
-      for (const l of o) {
-        const u = hn(l.data, Nr);
-        try {
-          a.addColumnSpec(l.id, l.spec), a.setColumnData(l.id, u);
-        } catch (d) {
-          throw new Error(
-            `Adding column ${l.id} to PFrame failed: ${d}; Spec: ${JSON.stringify(l.spec)}, DataInfo: ${JSON.stringify(u)}.`
-          );
-        }
+        return l;
+      } catch (l) {
+        throw new Error(
+          `Data PFrame creation failed, columns: ${JSON.stringify(i)}, error: ${l}`
+        );
       }
-      return a;
     };
-    this.specPFrame = i(), this.createDataPFrame = c;
+    this.specPFrame = a(), this.createDataPFrame = c;
   }
   get disposableDataPFrame() {
     const e = this.createDataPFrame();
@@ -4609,41 +4635,41 @@ class gl {
       fetchMethod: async (n) => await Ur.readFile(n),
       sizeCalculation: (n) => n.length
     }), o = new Bs(1);
-    this.blobContentCache = r, this.concurrencyLimiter = o, this.pFrames = new class extends Lr {
+    this.blobContentCache = r, this.concurrencyLimiter = o, this.pFrames = new class extends Nr {
       constructor(n, i) {
         super(), this.blobDriver = n, this.logger = i;
       }
       createNewResource(n) {
-        return te().logPFrameRequests && t.info(
+        return re().logPFrameRequests && t.info(
           `PFrame creation (pFrameHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
         ), new fl(this.blobDriver, this.logger, r, n);
       }
       calculateParamsKey(n) {
         return vl(n);
       }
-    }(this.blobDriver, this.logger), this.pTables = new class extends Lr {
+    }(this.blobDriver, this.logger), this.pTables = new class extends Nr {
       constructor(n) {
         super(), this.pFrames = n;
       }
       async createNewResource(n) {
-        const i = n.pFrameHandle, c = await o.run(async () => {
+        const i = n.pFrameHandle, a = await o.run(async () => {
           var l = [];
           try {
-            te().logPFrameRequests && t.info(
+            re().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: gt(n.def.filters)
+            const c = je(l, this.pFrames.getByKey(i).disposableDataPFrame);
+            return await c.dataPFrame.createTable({
+              src: Ie(n.def.src),
+              filters: mt(n.def.filters)
             });
           } catch (u) {
             var d = u, f = !0;
           } finally {
-            je(l, d, f);
+            xe(l, d, f);
           }
         });
-        return n.def.sorting.length !== 0 ? c.sort(n.def.sorting) : c;
+        return n.def.sorting.length !== 0 ? a.sort(n.def.sorting) : a;
       }
       calculateParamsKey(n) {
         return ml(n);
@@ -4663,10 +4689,10 @@ class gl {
     return t.addOnDestroy(o.unref), o.key;
   }
   createPTable(e, t) {
-    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(
+    const r = this.createPFrame($s(e.src), t), o = vt(e, (i) => i.id), n = this.pTables.acquire({ def: o, pFrameHandle: r });
+    return re().logPFrameRequests && this.logger.info(
       `Create PTable call (pFrameHandle = ${r}; pTableHandle = ${JSON.stringify(n)}): ${JSON.stringify(
-        mt(e, (i) => i.spec),
+        vt(e, (i) => i.spec),
         Ee
       )}`
     ), t.addOnDestroy(n.unref), n.key;
@@ -4680,7 +4706,7 @@ class gl {
       compatibleWith: t.compatibleWith.length !== 0 ? [{
         axesSpec: [
           ...new Map(t.compatibleWith.map(
-            (n) => [re(n), n]
+            (n) => [Q(n), n]
           )).values()
         ],
         qualifications: []
@@ -4691,7 +4717,7 @@ class gl {
         async () => await this.pFrames.getByKey(e).specPFrame.findColumns(r)
       )).hits.filter((n) => (
         // only exactly matching columns
-        n.mappingVariants.length === 0 || n.mappingVariants.some((i) => i.qualifications.forHit.length === 0 && i.qualifications.forQueries.every((c) => c.length === 0))
+        n.mappingVariants.length === 0 || n.mappingVariants.some((i) => i.qualifications.forHit.length === 0 && i.qualifications.forQueries.every((a) => a.length === 0))
       )).map((n) => n.hit)
     };
   }
@@ -4707,20 +4733,20 @@ class gl {
   }
   async calculateTableData(e, t) {
     let r = await this.concurrencyLimiter.run(async () => {
-      var c = [];
+      var a = [];
       try {
-        te().logPFrameRequests && this.logger.info(
+        re().logPFrameRequests && this.logger.info(
           `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
         );
-        const i = Be(c, this.pFrames.getByKey(e).disposableDataPFrame);
+        const i = je(a, this.pFrames.getByKey(e).disposableDataPFrame);
         return await i.dataPFrame.createTable({
-          src: Fe(t.src),
-          filters: gt(t.filters)
+          src: Ie(t.src),
+          filters: mt(t.filters)
         });
-      } catch (a) {
-        var l = a, u = !0;
+      } catch (c) {
+        var l = c, u = !0;
       } finally {
-        je(c, l, u);
+        xe(a, l, u);
       }
     });
     if (t.sorting.length > 0) {
@@ -4732,27 +4758,27 @@ class gl {
     const o = r.getSpec(), n = await this.concurrencyLimiter.run(
       async () => await r.getData([...o.keys()])
     );
-    return r.dispose(), o.map((i, c) => ({
+    return r.dispose(), o.map((i, a) => ({
       spec: i,
-      data: n[c]
+      data: n[a]
     }));
   }
   async getUniqueValues(e, t) {
     return await this.concurrencyLimiter.run(async () => {
       var o = [];
       try {
-        te().logPFrameRequests && this.logger.info(
+        re().logPFrameRequests && this.logger.info(
           `Call getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
         );
-        const r = Be(o, this.pFrames.getByKey(e).disposableDataPFrame);
+        const r = je(o, this.pFrames.getByKey(e).disposableDataPFrame);
         return await r.dataPFrame.getUniqueValues({
           ...t,
-          filters: gt(t.filters)
+          filters: mt(t.filters)
         });
       } catch (n) {
-        var i = n, c = !0;
+        var i = n, a = !0;
       } finally {
-        je(o, i, c);
+        xe(o, i, a);
       }
     });
   }
@@ -4772,7 +4798,7 @@ class gl {
     );
   }
 }
-function Fe(s) {
+function Ie(s) {
   switch (s.type) {
     case "column":
       return {
@@ -4784,21 +4810,21 @@ function Fe(s) {
     case "full":
       return {
         type: s.type,
-        entries: s.entries.map((e) => Fe(e))
+        entries: s.entries.map((e) => Ie(e))
       };
     case "outer":
       return {
         type: "outer",
-        primary: Fe(s.primary),
-        secondary: s.secondary.map((e) => Fe(e))
+        primary: Ie(s.primary),
+        secondary: s.secondary.map((e) => Ie(e))
       };
     default:
       M(s);
   }
 }
 function ml(s) {
-  const e = Ne("sha256");
-  return e.update(re(s)), e.digest().toString("hex");
+  const e = De("sha256");
+  return e.update(Q(s)), e.digest().toString("hex");
 }
 function vl(s) {
   const e = [...s].map(
@@ -4810,9 +4836,9 @@ function vl(s) {
           n = {
             type: o.type,
             keyLength: o.keyLength,
-            payload: Object.entries(o.data).map(([c, a]) => ({
-              key: c,
-              value: a
+            payload: Object.entries(o.data).map(([a, c]) => ({
+              key: a,
+              value: c
             }))
           };
           break;
@@ -4820,9 +4846,9 @@ function vl(s) {
           n = {
             type: o.type,
             keyLength: o.partitionKeyLength,
-            payload: Object.entries(o.parts).map(([c, a]) => ({
-              key: c,
-              value: a.id.toString()
+            payload: Object.entries(o.parts).map(([a, c]) => ({
+              key: a,
+              value: Fe(c)
             }))
           };
           break;
@@ -4830,28 +4856,28 @@ function vl(s) {
           n = {
             type: o.type,
             keyLength: o.partitionKeyLength,
-            payload: Object.entries(o.parts).map(([c, a]) => ({
-              key: c,
-              value: [a.index.id.toString(), a.values.id.toString()]
+            payload: Object.entries(o.parts).map(([a, c]) => ({
+              key: a,
+              value: [Fe(c.index), Fe(c.values)]
             }))
           };
           break;
         default:
-          throw Error(`unsupported resource type: ${i}`);
+          throw Error(`unsupported resource type: ${JSON.stringify(i)}`);
       }
-      return n.payload.sort((c, a) => c.key.localeCompare(a.key)), n;
+      return n.payload.sort((a, c) => a.key.localeCompare(c.key)), n;
     })
   );
   e.sort((r, o) => r.id.localeCompare(o.id));
-  const t = Ne("sha256");
-  return t.update(re(e)), t.digest().toString("hex");
+  const t = De("sha256");
+  return t.update(Q(e)), t.digest().toString("hex");
 }
 async function yl(s, e, t) {
   const r = {
     ...ps,
     ...hs(e),
     ...t
-  }, o = new Vr(r.localSecret), n = eo(r.logger, s, r.localProjections), i = to(s, r.logger), c = ro(s, r.logger), a = so(s, r.logger), l = new oo(
+  }, o = new Vr(r.localSecret), n = eo(r.logger, s, r.localProjections), i = to(s, r.logger), a = ro(s, r.logger), c = so(s, r.logger), l = new oo(
     r.logger,
     n,
     i,
@@ -4867,8 +4893,8 @@ async function yl(s, e, t) {
   ), d = new io(
     r.logger,
     o,
-    c,
     a,
+    c,
     r.uploadDriverOps
   ), f = new ao(r.logger, i, r.logStreamDriverOps), h = new co(r.logger, f, l), g = await lo.init(
     r.logger,
@@ -4889,7 +4915,7 @@ async function yl(s, e, t) {
   };
 }
 class bs {
-  constructor(e, t, r, o, n, i, c, a) {
+  constructor(e, t, r, o, n, i, a, c) {
     S(this, "pl");
     /** Contains a reactive list of projects along with their meta information. */
     S(this, "projectList");
@@ -4897,7 +4923,7 @@ class bs {
     // Projects
     //
     S(this, "openedProjectsByRid", /* @__PURE__ */ new Map());
-    this.env = e, this.driverKit = t, this.signer = r, this.projectListResourceId = o, this.openedProjectsList = n, this.projectListTree = i, this.blockRegistryProvider = c, this.projectList = a, this.pl = this.env.pl;
+    this.env = e, this.driverKit = t, this.signer = r, this.projectListResourceId = o, this.openedProjectsList = n, this.projectListTree = i, this.blockRegistryProvider = a, this.projectList = c, this.pl = this.env.pl;
   }
   /** Returns extended API driver kit used internally by middle layer. */
   get internalDriverKit() {
@@ -4907,7 +4933,7 @@ class bs {
   // Project List Manipulation
   //
   /** Creates a project with initial state and adds it to project list. */
-  async createProject(e, t = Ie()) {
+  async createProject(e, t = Ae()) {
     const r = await this.pl.withWriteTx("MLCreateProject", async (o) => {
       const n = await dn(o, e);
       return o.createField(j(this.projectListResourceId, t), "Dynamic", n), await o.commit(), await _s(n);
@@ -4930,7 +4956,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 (ze(r)) throw new Error("Unexpected project list structure.");
+      if (Xe(r)) throw new Error("Unexpected project list structure.");
       return r;
     });
   }
@@ -4941,7 +4967,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 Bt.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
+    this.openedProjectsByRid.set(t, await jt.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
   }
   /** Closes the project, and deallocate all corresponding resources. */
   async closeProject(e) {
@@ -4978,48 +5004,48 @@ class bs {
       ...gi(t),
       ...r
     };
-    o.defaultTreeOptions.logStat = te().logTreeStats;
+    o.defaultTreeOptions.logStat = re().logTreeStats;
     const n = await e.withWriteTx("MLInitialization", async (C) => {
       const I = j(C.clientRoot, No);
       C.createField(I, "Dynamic");
       const N = await C.getField(I);
-      if (ze(N.value)) {
+      if (Xe(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 yl(e, t, o), a = new Is(e.httpDispatcher, {
+    }), i = o.logger, a = await yl(e, t, o), c = new Is(e.httpDispatcher, {
       minTimeout: 250,
       maxRetries: 4
-    }), l = new Ro(a), u = new sn(
+    }), l = new Ro(c), u = new sn(
       l,
-      c.signer,
-      a
+      a.signer,
+      c
     ), d = new uo(
       i,
       e.httpDispatcher,
       o.frontendDownloadPath
     ), f = {
       pl: e,
-      signer: c.signer,
+      signer: a.signer,
       logger: i,
       httpDispatcher: e.httpDispatcher,
-      retryHttpDispatcher: a,
+      retryHttpDispatcher: c,
       ops: o,
       bpPreparer: u,
       frontendDownloadDriver: d,
-      driverKit: c,
+      driverKit: a,
       blockUpdateWatcher: new pl(l, i, {
         minDelay: o.devBlockUpdateRecheckInterval,
-        http: a,
+        http: c,
         preferredUpdateChannel: o.preferredUpdateChannel
       }),
       quickJs: await Zs()
     }, h = new zs([]), g = await Bo(e, n, h, f);
     return new bs(
       f,
-      c,
-      c.signer,
+      a,
+      a.signer,
       n,
       h,
       g.tree,
@@ -5084,14 +5110,14 @@ async function ru(s, e = {}) {
     bodyLimit: 300,
     ...e
   }, r = [];
-  wl.forEach((a) => {
-    fo(a).subscribe((u) => {
+  wl.forEach((c) => {
+    fo(c).subscribe((u) => {
       var f;
       const d = (/* @__PURE__ */ new Date()).toISOString();
       (f = u == null ? void 0 : u.response) != null && f.headers && (u.response.headers = u.response.headers.map((h) => h.toString())), r.push(
         JSON.stringify({
           timestamp: d,
-          event: a,
+          event: c,
           data: u
         })
       );
@@ -5106,49 +5132,49 @@ async function ru(s, e = {}) {
     autoUpdateCdnChecks: []
   }, n = Ks(s, { defaultRequestTimeout: t.pingTimeoutMs });
   o.plPings = await ve(t.pingCheckDurationMs, t.maxPingsPerSecond, async () => {
-    const l = await new Xt(n).ping();
+    const l = await new Yt(n).ping();
     return JSON.stringify(l).slice(0, t.bodyLimit) + "...";
   });
-  const c = new Xt(n).ll.httpDispatcher;
+  const a = new Yt(n).ll.httpDispatcher;
   return o.blockRegistryOverviewChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await Pe(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, a)
   ), o.blockGARegistryOverviewChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await Pe(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, a)
   ), o.blockRegistryUiChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await Pe(new URL(t.blockUiPath, t.blockRegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockUiPath, t.blockRegistryUrl), t, a)
   ), o.blockGARegistryUiChecks = await ve(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await Pe(new URL(t.blockUiPath, t.blockGARegistryUrl), t, c)
+    async () => await Pe(new URL(t.blockUiPath, t.blockGARegistryUrl), t, a)
   ), o.autoUpdateCdnChecks = await ve(
     t.autoUpdateCdnDurationMs,
     t.maxAutoUpdateCdnChecksPerSecond,
-    async () => await Pe(t.autoUpdateCdnUrl, t, c)
+    async () => await Pe(t.autoUpdateCdnUrl, t, a)
   ), Sl(o, s, t, r);
 }
 async function ve(s, e, t) {
-  const r = $t(), o = [];
+  const r = Ft(), o = [];
   for (; Dr(r) < s; ) {
-    const n = $t();
+    const n = Ft();
     let i;
     try {
       i = { ok: !0, value: await t() };
     } catch (l) {
       i = { ok: !1, error: l };
     }
-    const c = Dr(n);
+    const a = Dr(n);
     o.push({
-      elapsedMs: c,
+      elapsedMs: a,
       response: i
     });
-    const a = 1e3 / e - c;
-    a > 0 && await _r(a);
+    const c = 1e3 / e - a;
+    c > 0 && await _r(c);
   }
   return o;
 }
@@ -5164,8 +5190,8 @@ async function Pe(s, e, t) {
   };
 }
 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)))
+  const o = s.plPings.filter((a) => a.response.ok), n = s.plPings.filter((a) => !a.response.ok), i = [
+    ...new Set(o.map((a) => JSON.stringify(a.response.value)))
   ];
   return `
 Network report:
@@ -5229,11 +5255,11 @@ function bl(s) {
   }
   return { mean: t, median: r };
 }
-function $t() {
+function Ft() {
   return Date.now();
 }
 function Dr(s) {
-  return $t() - s;
+  return Ft() - s;
 }
 export {
   ql as BlockPackRegistry,
@@ -5245,7 +5271,7 @@ export {
   Zr as FrontendFromFolderResourceType,
   Qr as FrontendFromUrlResourceType,
   bs as MiddleLayer,
-  Bt as Project,
+  jt as Project,
   zo as TengoTemplateGet,
   Xo as TengoTemplateGetRegistry,
   Qo as TengoTemplateGetTemplate,
@@ -5260,9 +5286,9 @@ export {
   ru as checkNetwork,
   Xr as createRenderTemplate,
   Hr as getDevV1PacketMtime,
-  At as getDevV2PacketMtime,
+  Tt as getDevV2PacketMtime,
   yl as initDriverKit,
-  Lt as loadTemplate,
+  Nt as loadTemplate,
   Zo as prepareTemplateSpec
 };
 //# sourceMappingURL=index.mjs.map