@milaboratories/pl-middle-layer 1.10.36 → 1.10.39

package/dist/index.mjs

@@ -1,33 +1,33 @@
-var Kt = Object.defineProperty;
-var Mt = (o, e, t) => e in o ? Kt(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
-var d = (o, e, t) => Mt(o, typeof e != "symbol" ? e + "" : e, t);
-import { executePSpecPredicate as Ut, mapPObjectData as q, mapValueInVOE as $t, mapPTableDef as ct, isFunctionHandle as ut, normalizeBlockConfig as De, DefaultNavigationState as Gt } from "@platforma-sdk/model";
+var Mt = Object.defineProperty;
+var Ut = (o, e, t) => e in o ? Mt(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var d = (o, e, t) => Ut(o, typeof e != "symbol" ? e + "" : e, t);
+import { executePSpecPredicate as $t, mapPObjectData as q, mapValueInVOE as Gt, mapPTableDef as ut, isFunctionHandle as lt, normalizeBlockConfig as je, DefaultNavigationState as Ht } from "@platforma-sdk/model";
 export * from "@platforma-sdk/model";
-import { blockPackIdEquals as Ht } from "@milaboratories/pl-model-middle-layer";
+import { blockPackIdEquals as me } from "@milaboratories/pl-model-middle-layer";
 export * from "@milaboratories/pl-model-middle-layer";
 import { request as G, RetryAgent as _t } from "undici";
-import { RegistryV1 as H, tryLoadPackDescription as lt, BlockPackMetaEmbedAbsoluteBytes as Wt, RegistryV2Reader as zt, folderReaderByUrl as Yt, loadPackDescription as He } from "@platforma-sdk/block-tools";
+import { RegistryV1 as H, tryLoadPackDescription as dt, BlockPackMetaEmbedAbsoluteBytes as Wt, RegistryV2Reader as zt, folderReaderByUrl as Yt, loadPackDescription as _e } from "@platforma-sdk/block-tools";
 import T from "node:fs";
 import I from "node:path";
 import qt from "yaml";
-import { assertNever as O, notEmpty as w, ConsoleLoggerAdapter as Qt, HmacSha256Signer as dt } from "@milaboratories/ts-helpers";
+import { assertNever as O, notEmpty as w, ConsoleLoggerAdapter as Qt, HmacSha256Signer as pt } from "@milaboratories/ts-helpers";
 import * as Zt from "node:fs/promises";
 import { tryResolve as Xt } from "@milaboratories/resolve-helper";
-import { resourceTypesEqual as U, field as S, Pl as b, PlClient as er, isNullResourceId as ce, ensureResourceIdNotNull as we, isResource as tr, isResourceRef as rr, isNotNullResourceId as _e, resourceType as te, resourceTypeToString as or, resourceIdToString as pt, isNotFoundError as sr, isTimeoutOrCancelError as ir, toGlobalResourceId as nr } from "@milaboratories/pl-client";
+import { resourceTypesEqual as U, field as S, Pl as b, PlClient as er, isNullResourceId as ce, ensureResourceIdNotNull as Se, isResource as tr, isResourceRef as rr, isNotNullResourceId as We, resourceType as te, resourceTypeToString as or, resourceIdToString as gt, isNotFoundError as sr, isTimeoutOrCancelError as ir, toGlobalResourceId as nr } from "@milaboratories/pl-client";
 export * from "@milaboratories/pl-client";
-import { SynchronizedTreeState as gt, PlError as ar } from "@milaboratories/pl-tree";
-import { Computable as P, ChangeSource as We, PollComputablePool as cr, WatchableValue as ur } from "@milaboratories/computable";
+import { SynchronizedTreeState as ht, PlError as ar } from "@milaboratories/pl-tree";
+import { Computable as P, ChangeSource as ze, PollComputablePool as cr, WatchableValue as ur } from "@milaboratories/computable";
 import { randomUUID as Z, createHash as ge } from "node:crypto";
-import ht from "denque";
+import ft from "denque";
 import { Templates as lr } from "@platforma-sdk/workflow-tengo";
-import je from "canonicalize";
+import Ee from "canonicalize";
 import dr from "node:assert";
-import { Scope as Se, getQuickJS as pr } from "quickjs-emscripten";
+import { Scope as ke, getQuickJS as pr } from "quickjs-emscripten";
 import { setTimeout as gr } from "node:timers/promises";
-import * as ft from "node:os";
+import * as mt from "node:os";
 import { createDownloadClient as hr, createLogsClient as fr, createUploadBlobClient as mr, createUploadProgressClient as vr, createLsFilesClient as yr, DownloadDriver as br, UploadDriver as wr, LogsStreamDriver as Sr, LogsDriver as kr, LsDriver as Cr, DownloadUrlDriver as Pr } from "@milaboratories/pl-drivers";
 import { PFrame as Fr } from "@milaboratories/pframes-node";
-async function ze(o) {
+async function Ye(o) {
   try {
     return await Zt.stat(o, { bigint: !0 });
   } catch (e) {
@@ -36,30 +36,30 @@ async function ze(o) {
     throw e;
   }
 }
-const Br = [H.PlPackageYamlConfigFile], Rr = [H.PlPackageJsonConfigFile], Ee = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], Te = ["config", "dist", "config.json"], mt = ["frontend", "dist"], Ye = "block-model/dist/config.json", Or = "block-ui/package.json", xr = [
-  Ee,
+const Br = [H.PlPackageYamlConfigFile], Rr = [H.PlPackageJsonConfigFile], Te = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], Ae = ["config", "dist", "config.json"], vt = ["frontend", "dist"], qe = "block-model/dist/config.json", Or = "block-ui/package.json", xr = [
   Te,
+  Ae,
   Br,
   Rr,
-  mt
+  vt
 ];
 async function Dr(o) {
-  return await ze(I.join(o, ...Te)) !== void 0 || await ze(I.join(o, ...Ee)) !== void 0;
+  return await Ye(I.join(o, ...Ae)) !== void 0 || await Ye(I.join(o, ...Te)) !== void 0;
 }
-function me(o, e) {
+function ve(o, e) {
   const t = Xt(o, e);
   if (t === void 0) throw new Error(`Can't resolve ${e} against ${o}`);
   return t;
 }
-async function qe(o, e) {
+async function Qe(o, e) {
   if (I.isAbsolute(o) || (o = I.resolve(o)), await Dr(o))
     return {
-      workflow: I.join(o, ...Ee),
-      config: I.join(o, ...Te),
-      ui: I.join(o, ...mt)
+      workflow: I.join(o, ...Te),
+      config: I.join(o, ...Ae),
+      ui: I.join(o, ...vt)
     };
   {
-    const t = me(o, Ye), r = me(o, Ye), s = me(o, Or);
+    const t = ve(o, qe), r = ve(o, qe), s = ve(o, Or);
     return { workflow: t, config: r, ui: I.resolve(s, "..", "dist") };
   }
 }
@@ -81,7 +81,7 @@ async function Er(o) {
     throw e;
   }
 }
-async function vt(o) {
+async function yt(o) {
   let e = 0n;
   for (const t of xr) {
     const r = I.join(o, ...t), s = await Er(r);
@@ -89,7 +89,7 @@ async function vt(o) {
   }
   return e.toString();
 }
-async function Ae(o) {
+async function Ie(o) {
   const e = await T.promises.stat(o.components.workflow.main.file, {
     bigint: !0
   }), t = await T.promises.stat(o.components.model.file, { bigint: !0 });
@@ -145,7 +145,7 @@ class ei {
             I.join(c, H.PlPackageYamlConfigFile)
           );
           if (u !== void 0) {
-            const l = H.PlPackageConfigData.parse(qt.parse(u)), p = await vt(c), g = {
+            const l = H.PlPackageConfigData.parse(qt.parse(u)), p = await yt(c), g = {
               organization: l.organization,
               name: l.package,
               version: "DEV"
@@ -169,9 +169,9 @@ class ei {
               otherVersions: []
             });
           } else {
-            const l = await lt(c);
+            const l = await dt(c);
             if (l !== void 0) {
-              const p = await Ae(l);
+              const p = await Ie(l);
               t.push({
                 registryId: e.id,
                 id: l.id,
@@ -226,22 +226,22 @@ const ti = {
   blocksInLimbo: []
 }, Vr = {
   label: "New Project"
-}, Nr = { name: "UserProject", version: "2" }, yt = "SchemaVersion", bt = "1", Ie = "ProjectCreated", X = "ProjectLastModified", ee = "ProjectMeta", _ = "ProjectStructure", ue = "BlockRenderingState", Lr = "BlockFrontendState/", Jr = /^BlockFrontendState\/(?<blockid>.*)$/;
-function ke(o) {
+}, Nr = { name: "UserProject", version: "2" }, bt = "SchemaVersion", wt = "1", Ve = "ProjectCreated", X = "ProjectLastModified", ee = "ProjectMeta", _ = "ProjectStructure", ue = "BlockRenderingState", Lr = "BlockFrontendState/", Jr = /^BlockFrontendState\/(?<blockid>.*)$/;
+function Ce(o) {
   return `${Lr}${o}`;
 }
 const Kr = "BlockArgsAuthor/";
-function Ce(o) {
+function Pe(o) {
   return `${Kr}${o}`;
 }
-const Pe = "ProjectStructureAuthor";
+const Fe = "ProjectStructureAuthor";
 function Mr(o) {
   const e = o.match(Jr);
   if (e !== null)
     return e.groups.blockid;
 }
 const Ur = "__serviceTemplate_";
-function Fe(o) {
+function Be(o) {
   return `${Ur}${o}`;
 }
 function C(o, e) {
@@ -254,9 +254,9 @@ function Gr(o) {
   const { blockId: t, fieldName: r } = e.groups;
   return { blockId: t, fieldName: r };
 }
-const Hr = "projects", wt = { name: "Projects", version: "1" }, _r = (o) => U(o.type, wt) ? o.fields : [];
+const Hr = "projects", St = { name: "Projects", version: "1" }, _r = (o) => U(o.type, St) ? o.fields : [];
 async function Wr(o, e, t, r) {
-  const s = await gt.init(o, e, {
+  const s = await ht.init(o, e, {
     ...r.ops.defaultTreeOptions,
     pruning: _r
   });
@@ -267,7 +267,7 @@ async function Wr(o, e, t, r) {
     for (const l of a.listDynamicFields()) {
       const p = a.traverse(l);
       if (p === void 0) continue;
-      const g = w(p.getKeyValueAsJson(ee)), f = w(p.getKeyValueAsJson(Ie)), v = w(p.getKeyValueAsJson(X));
+      const g = w(p.getKeyValueAsJson(ee)), f = w(p.getKeyValueAsJson(Ve)), v = w(p.getKeyValueAsJson(X));
       u.push({
         id: l,
         rid: p.id,
@@ -287,14 +287,14 @@ const zr = {
   name: "RenderTemplate",
   version: "1"
 };
-function St(o, e, t, r, s) {
+function kt(o, e, t, r, s) {
   if (s.length === 0) throw new Error("Zero output names provided");
   const i = t ? o.createEphemeral(zr) : o.createStruct(Yr), n = S(i, "template"), a = S(i, "inputs");
   return o.createField(n, "Input", e), o.createField(a, "Input", b.createPlMap(o, r, t)), o.lockInputs(i), b.futureRecord(o, i, s, "Output", "outputs/");
 }
 const qr = { name: "BContextEnd", version: "1" }, Qr = { name: "BContext", version: "1" }, Zr = "id", Xr = "parent/", eo = ["context", "result"];
-function Qe(o, e, t) {
-  return St(o, e, !0, t, eo);
+function Ze(o, e, t) {
+  return kt(o, e, !0, t, eo);
 }
 function to(o) {
   const e = o.createEphemeral(qr);
@@ -335,7 +335,7 @@ function ho(o, e) {
   const t = o.createValue(ao, e.content), r = o.createStruct(co), s = S(r, uo), i = S(r, lo);
   return o.setField(s, t), i;
 }
-function Ve(o, e) {
+function Ne(o, e) {
   switch (e.type) {
     case "from-registry":
       return go(o, e);
@@ -345,7 +345,7 @@ function Ve(o, e) {
       return O(e);
   }
 }
-const kt = { name: "Frontend/FromUrl", version: "1" }, Ct = {
+const Ct = { name: "Frontend/FromUrl", version: "1" }, Pt = {
   name: "Frontend/FromFolder",
   version: "1"
 };
@@ -353,12 +353,12 @@ function fo(o, e) {
   switch (e.type) {
     case "url":
       return o.createValue(
-        kt,
+        Ct,
         JSON.stringify({ url: e.url })
       );
     case "local":
       return o.createValue(
-        Ct,
+        Pt,
         JSON.stringify({
           path: e.path,
           signature: e.signature
@@ -368,8 +368,8 @@ function fo(o, e) {
       return O(e);
   }
 }
-const mo = { name: "BlockPackCustom", version: "1" }, Pt = "template", Ft = "frontend";
-function Ze(o) {
+const mo = { name: "BlockPackCustom", version: "1" }, Ft = "template", Bt = "frontend";
+function Xe(o) {
   return o.endsWith("/") ? o : `${o}/`;
 }
 class vo {
@@ -381,17 +381,17 @@ class vo {
       case "explicit":
         return e.config;
       case "dev-v1": {
-        const t = await qe(e.folder), r = await T.promises.readFile(t.config, { encoding: "utf-8" });
+        const t = await Qe(e.folder), r = await T.promises.readFile(t.config, { encoding: "utf-8" });
         return JSON.parse(r);
       }
       case "dev-v2": {
-        const t = await He(e.folder), r = await T.promises.readFile(t.components.model.file, {
+        const t = await _e(e.folder), r = await T.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 = `${Ze(e.registryUrl)}${H.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`;
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${Xe(e.registryUrl)}${H.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`;
         return await (await G(`${r}/config.json`, t)).body.json();
       }
       case "from-registry-v2": {
@@ -407,7 +407,7 @@ class vo {
       case "explicit":
         return e;
       case "dev-v1": {
-        const t = await qe(e.folder), r = await T.promises.readFile(t.workflow), s = JSON.parse(
+        const t = await Qe(e.folder), r = await T.promises.readFile(t.workflow), s = JSON.parse(
           await T.promises.readFile(t.config, "utf-8")
         ), i = t.ui;
         return {
@@ -426,14 +426,14 @@ class vo {
         };
       }
       case "dev-v2": {
-        const t = await He(e.folder), r = JSON.parse(
+        const t = await _e(e.folder), r = JSON.parse(
           await T.promises.readFile(t.components.model.file, {
             encoding: "utf-8"
           })
         ), s = await T.promises.readFile(
           t.components.workflow.main.file
         ), i = t.components.ui.folder, n = { ...e };
-        return e.mtime === void 0 && (n.mtime = await Ae(t)), {
+        return e.mtime === void 0 && (n.mtime = await Ie(t)), {
           type: "explicit",
           template: {
             type: "explicit",
@@ -449,7 +449,7 @@ class vo {
         };
       }
       case "from-registry-v1": {
-        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${Ze(e.registryUrl)}${H.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, s = `${r}/template.plj.gz`, i = await G(s, t);
+        const t = this.http !== void 0 ? { dispatcher: this.http } : {}, r = `${Xe(e.registryUrl)}${H.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, s = `${r}/template.plj.gz`, i = await G(s, t);
         if (i.statusCode !== 200)
           throw new Error(
             `Block not found in registry (url = ${s} ; code = ${i.statusCode}): ` + JSON.stringify(e)
@@ -492,9 +492,9 @@ class vo {
 }
 function yo(o, e) {
   const t = { config: e.config, source: e.source }, r = o.createStruct(mo, JSON.stringify(t));
-  return o.createField(S(r, Pt), "Input", Ve(o, e.template)), o.createField(S(r, Ft), "Input", fo(o, e.frontend)), o.lock(r), r;
+  return o.createField(S(r, Ft), "Input", Ne(o, e.template)), o.createField(S(r, Bt), "Input", fo(o, e.frontend)), o.lock(r), r;
 }
-function Xe(o, e) {
+function et(o, e) {
   switch (e.type) {
     case "explicit":
       return yo(o, e);
@@ -508,7 +508,7 @@ function ie(o, e) {
 function bo(o) {
   return typeof o == "object" && o !== null && o.__isRef === !0 && "blockId" in o && "name" in o;
 }
-function Be(o, e, t) {
+function Re(o, e, t) {
   const r = typeof e;
   switch (r) {
     case "function":
@@ -524,10 +524,10 @@ function Be(o, e, t) {
       if (bo(e))
         t === void 0 || t.has(e.blockId) ? o.upstreams.add(e.blockId) : o.missingReferences = !0;
       else if (Array.isArray(e))
-        for (const s of e) Be(o, s, t);
+        for (const s of e) Re(o, s, t);
       else
         for (const [, s] of Object.entries(e))
-          Be(o, s, t);
+          Re(o, s, t);
       return;
     default:
       O(r);
@@ -535,7 +535,7 @@ function Be(o, e, t) {
 }
 function wo(o, e) {
   const t = { upstreams: /* @__PURE__ */ new Set(), missingReferences: !1 };
-  return Be(t, o, e), t;
+  return Re(t, o, e), t;
 }
 function V(o) {
   return {
@@ -544,7 +544,7 @@ function V(o) {
     }
   };
 }
-class Bt {
+class Rt {
   constructor(e) {
     /** Nodes are stored in the map in topological order */
     d(this, "nodes");
@@ -574,7 +574,7 @@ class Bt {
     }
   }
 }
-function Re(o) {
+function Oe(o) {
   const e = /* @__PURE__ */ new Map();
   let t;
   for (const { id: r } of V(o)) {
@@ -584,7 +584,7 @@ function Re(o) {
     };
     e.set(r, s), t === void 0 ? s.upstream = /* @__PURE__ */ new Set() : (s.upstream = /* @__PURE__ */ new Set([t.id]), t.downstream = /* @__PURE__ */ new Set([s.id])), t = s;
   }
-  return t !== void 0 && (t.downstream = /* @__PURE__ */ new Set()), new Bt(e);
+  return t !== void 0 && (t.downstream = /* @__PURE__ */ new Set()), new Rt(e);
 }
 function ne(o, e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
@@ -600,41 +600,41 @@ function ne(o, e) {
     };
     t.set(s, a), n.upstreams.forEach((c) => t.get(c).downstream.add(s)), r.add(s);
   }
-  return new Bt(t);
+  return new Rt(t);
 }
 function So(o, e) {
   if (o.size !== e.size) return !1;
   for (const t of o) if (!e.has(t)) return !1;
   return !0;
 }
-function Oe(o, e) {
-  if (o.size > e.size) return Oe(e, o);
+function xe(o, e) {
+  if (o.size > e.size) return xe(e, o);
   for (const t of o) if (e.has(t)) return !0;
   return !1;
 }
-function et(o, e) {
+function tt(o, e) {
   const t = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), s = /* @__PURE__ */ new Set();
   return o.nodes.forEach((i) => {
     const n = e.nodes.get(i.id);
-    n === void 0 ? t.add(i.id) : (!So(i.upstream, n.upstream) || Oe(i.upstream, s)) && s.add(i.id);
+    n === void 0 ? t.add(i.id) : (!So(i.upstream, n.upstream) || xe(i.upstream, s)) && s.add(i.id);
   }), e.nodes.forEach((i) => {
-    o.nodes.has(i.id) ? Oe(i.upstream, s) && s.add(i.id) : r.add(i.id);
+    o.nodes.has(i.id) ? xe(i.upstream, s) && s.add(i.id) : r.add(i.id);
   }), { onlyInA: t, onlyInB: r, different: s };
 }
-let ve;
-async function Rt() {
-  if (ve === void 0) {
+let ye;
+async function Ot() {
+  if (ye === void 0) {
     const o = await po(lr["pframes.export-pframe"]);
     if (o.type !== "explicit") throw new Error("Unexpected prepared template type.");
     const e = ge("sha256").update(o.content).digest("hex");
-    ve = { spec: o, hash: e };
+    ye = { spec: o, hash: e };
   }
-  return ve;
+  return ye;
 }
 function ko(o, e, t) {
-  return St(o, e, !0, { pf: t }, ["result"]).result;
+  return kt(o, e, !0, { pf: t }, ["result"]).result;
 }
-function ye(o, e) {
+function be(o, e) {
   let t = !1, r, s;
   return () => {
     if (!t)
@@ -643,13 +643,13 @@ function ye(o, e) {
     return r !== i && (r = i, s = e()), e();
   };
 }
-class tt {
+class rt {
   constructor(e, t) {
-    d(this, "currentInputsC", ye(
+    d(this, "currentInputsC", be(
       () => this.fields.currentArgs.modCount,
       () => JSON.parse(Buffer.from(this.fields.currentArgs.value).toString())
     ));
-    d(this, "actualProductionInputsC", ye(
+    d(this, "actualProductionInputsC", be(
       () => {
         var e;
         return (e = this.fields.prodArgs) == null ? void 0 : e.modCount;
@@ -661,7 +661,7 @@ class tt {
           return JSON.parse(Buffer.from(e).toString());
       }
     ));
-    d(this, "productionStaleC", ye(
+    d(this, "productionStaleC", be(
       () => {
         var e;
         return `${this.fields.currentArgs.modCount}_${(e = this.fields.prodArgs) == null ? void 0 : e.modCount}`;
@@ -703,7 +703,7 @@ class tt {
   getTemplate(e) {
     return e.getFutureFieldValue(
       b.unwrapHolder(e, this.fields.blockPack.ref),
-      Pt,
+      Ft,
       "Input"
     );
   }
@@ -745,7 +745,7 @@ class le {
     return JSON.parse(JSON.stringify(this.struct));
   }
   getStagingGraph() {
-    return this.stagingGraph === void 0 && (this.stagingGraph = Re(this.struct)), this.stagingGraph;
+    return this.stagingGraph === void 0 && (this.stagingGraph = Oe(this.struct)), this.stagingGraph;
   }
   getPendingProductionGraph() {
     return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = ne(
@@ -860,7 +860,7 @@ class le {
     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 s = t.getTemplate(this.tx), i = Qe(this.tx, s, {
+    const s = t.getTemplate(this.tx), i = Ze(this.tx, s, {
       args: t.fields.currentArgs.ref,
       blockId: this.tx.createValue(b.JsonString, JSON.stringify(e)),
       isProduction: this.tx.createValue(b.JsonBool, JSON.stringify(!1)),
@@ -881,7 +881,7 @@ class le {
     );
     if (this.getBlock(e).renderingMode === "Light")
       throw new Error("Can't render production for light block.");
-    const s = t.getTemplate(this.tx), i = Qe(this.tx, s, {
+    const s = t.getTemplate(this.tx), i = Ze(this.tx, s, {
       args: t.fields.currentArgs.ref,
       blockId: this.tx.createValue(b.JsonString, JSON.stringify(e)),
       isProduction: this.tx.createValue(b.JsonBool, JSON.stringify(!0)),
@@ -899,21 +899,21 @@ class le {
   //
   /** Very generic method, better check for more specialized case-specific methods first. */
   updateStructure(e, t = Co) {
-    const r = this.getStagingGraph(), s = this.getActualProductionGraph(), i = Re(e), n = ne(
+    const r = this.getStagingGraph(), s = this.getActualProductionGraph(), i = Oe(e), n = ne(
       e,
       (u) => {
         var l;
         return (l = this.blockInfos.get(u)) == null ? void 0 : l.actualProductionInputs;
       }
-    ), a = et(r, i), c = et(s, n);
+    ), a = tt(r, i), c = tt(s, n);
     for (const u of a.onlyInA) {
       const { fields: l } = this.getBlockInfo(u);
       this.deleteBlockFields(u, ...Object.keys(l)), this.blockInfos.delete(u), this.blocksInLimbo.delete(u) && (this.renderingStateChanged = !0), this.blockFrontendStates.delete(u) && this.changedBlockFrontendStates.add(u);
     }
     for (const u of a.onlyInB) {
-      const l = new tt(u, {});
+      const l = new rt(u, {});
       this.blockInfos.set(u, l);
-      const p = t(u), g = Xe(this.tx, p.blockPack);
+      const p = t(u), g = et(this.tx, p.blockPack);
       this.setBlockField(u, "blockPack", b.wrapInHolder(this.tx, g), "NotReady");
       const f = Buffer.from(p.args), v = this.tx.createValue(b.JsonObject, f);
       this.setBlockField(u, "currentArgs", v, "Ready", f), l.check();
@@ -967,7 +967,7 @@ class le {
     this.setBlockField(
       e,
       "blockPack",
-      b.wrapInHolder(this.tx, Xe(this.tx, t)),
+      b.wrapInHolder(this.tx, et(this.tx, t)),
       "NotReady"
     ), r !== void 0 ? (this.setArgs([{ blockId: e, args: r }]), this.setUiState(e, void 0)) : this.getStagingGraph().traverse("downstream", [e], ({ id: i }) => this.resetStaging(i)), s.productionRendered && this.getActualProductionGraph().traverse(
       "downstream",
@@ -1013,7 +1013,7 @@ class le {
    * accordingly */
   stopProduction(...e) {
     var n, a;
-    const t = this.getActualProductionGraph(), r = new ht(e), s = new Set(e), i = [];
+    const t = this.getActualProductionGraph(), r = new ft(e), s = new Set(e), i = [];
     for (; !r.isEmpty(); ) {
       const c = r.shift(), u = this.getBlockInfo(c).fields;
       if (!(((n = u.prodOutput) == null ? void 0 : n.status) === "Ready" && ((a = u.prodCtx) == null ? void 0 : a.status) === "Ready") && this.deleteBlockFields(c, "prodOutput", "prodCtx", "prodUiCtx", "prodArgs")) {
@@ -1073,8 +1073,8 @@ class le {
   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, Ce(t)) : this.tx.setKValue(this.rid, Ce(t), e);
-    (this.metaChanged || this.structureChanged) && (e === void 0 ? this.tx.deleteKValue(this.rid, Pe) : this.tx.setKValue(this.rid, Pe, e));
+      e === void 0 ? this.tx.deleteKValue(this.rid, Pe(t)) : this.tx.setKValue(this.rid, Pe(t), e);
+    (this.metaChanged || this.structureChanged) && (e === void 0 ? this.tx.deleteKValue(this.rid, Fe) : this.tx.setKValue(this.rid, Fe, e));
   }
   save() {
     if (this.wasModified) {
@@ -1088,13 +1088,13 @@ class le {
       ), this.metaChanged && this.tx.setKValue(this.rid, ee, JSON.stringify(this.meta));
       for (const e of this.changedBlockFrontendStates) {
         const t = this.blockFrontendStates.get(e);
-        t === void 0 ? this.tx.deleteKValue(this.rid, ke(e)) : this.tx.setKValue(this.rid, ke(e), t);
+        t === void 0 ? this.tx.deleteKValue(this.rid, Ce(e)) : this.tx.setKValue(this.rid, Ce(e), t);
       }
       this.assignAuthorMarkers();
     }
   }
   static async load(e, t, r) {
-    const s = e.getResourceData(t, !0), i = e.getKValueJson(t, yt), n = e.getKValueJson(t, X), a = e.getKValueJson(t, ee), c = e.getKValueJson(t, _), u = e.getKValueJson(t, ue), l = e.listKeyValuesString(t), [
+    const s = e.getResourceData(t, !0), i = e.getKValueJson(t, bt), n = e.getKValueJson(t, X), a = e.getKValueJson(t, ee), c = e.getKValueJson(t, _), u = e.getKValueJson(t, ue), l = e.listKeyValuesString(t), [
       p,
       g,
       f,
@@ -1111,7 +1111,7 @@ class le {
       u,
       l
     ]);
-    if (g !== bt)
+    if (g !== wt)
       throw new Error(
         `Can't act on this project resource because it has a wrong schema version: ${g}`
       );
@@ -1125,12 +1125,12 @@ class le {
         fields: {}
       }, $.set(R.blockId, F)), F.fields[R.fieldName] = ce(y.value) ? { modCount: 0 } : { modCount: 0, ref: y.value };
     }
-    const W = await Rt(), oe = Fe(W.hash), k = p.fields.find(
+    const W = await Ot(), oe = Be(W.hash), k = p.fields.find(
       (y) => y.name === oe
     );
     let J;
-    k !== void 0 ? J = we(k.value) : (J = b.wrapInHolder(e, Ve(e, W.spec)), e.createField(
-      S(t, Fe(W.hash)),
+    k !== void 0 ? J = Se(k.value) : (J = b.wrapInHolder(e, Ne(e, W.spec)), e.createField(
+      S(t, Be(W.hash)),
       "Dynamic",
       J
     ));
@@ -1150,10 +1150,10 @@ class le {
     });
     for (const [y, R] of B) {
       const F = await R;
-      y.value = F.data, _e(F.error) ? y.status = "Error" : F.resourceReady || _e(F.originalResourceId) ? y.status = "Ready" : y.status = "NotReady";
+      y.value = F.data, We(F.error) ? y.status = "Error" : F.resourceReady || We(F.originalResourceId) ? y.status = "Ready" : y.status = "NotReady";
     }
     const M = /* @__PURE__ */ new Map();
-    $.forEach(({ id: y, fields: R }) => M.set(y, new tt(y, R)));
+    $.forEach(({ id: y, fields: R }) => M.set(y, new rt(y, R)));
     const L = /* @__PURE__ */ new Set();
     for (const y of V(x)) {
       if (!M.has(y.id))
@@ -1186,15 +1186,15 @@ async function Po(o, e = Vr) {
   const t = o.createEphemeral(Nr);
   o.lock(t);
   const r = String(Date.now());
-  o.setKValue(t, yt, JSON.stringify(bt)), o.setKValue(t, Ie, r), o.setKValue(t, X, r), o.setKValue(t, ee, JSON.stringify(e)), o.setKValue(t, _, JSON.stringify(Ar)), o.setKValue(t, ue, JSON.stringify(Ir));
-  const s = await Rt();
+  o.setKValue(t, bt, JSON.stringify(wt)), o.setKValue(t, Ve, r), o.setKValue(t, X, r), o.setKValue(t, ee, JSON.stringify(e)), o.setKValue(t, _, JSON.stringify(Ar)), o.setKValue(t, ue, JSON.stringify(Ir));
+  const s = await Ot();
   return o.createField(
-    S(t, Fe(s.hash)),
+    S(t, Be(s.hash)),
     "Dynamic",
-    b.wrapInHolder(o, Ve(o, s.spec))
+    b.wrapInHolder(o, Ne(o, s.spec))
   ), t;
 }
-async function be(o, e, t) {
+async function we(o, e, t) {
   return A(o, e, void 0, t);
 }
 async function A(o, e, t, r) {
@@ -1223,7 +1223,7 @@ function* Fo(o) {
       O(o);
   }
 }
-function rt(o, e) {
+function ot(o, e) {
   return Object.fromEntries(
     Object.entries(o).map(([t, r]) => [t, e(r, t)])
   );
@@ -1233,11 +1233,11 @@ function Bo(o, e) {
     case "Json":
       return { ...o };
     case "JsonPartitioned":
-      return { ...o, parts: rt(o.parts, e) };
+      return { ...o, parts: ot(o.parts, e) };
     case "BinaryPartitioned":
       return {
         ...o,
-        parts: rt(o.parts, (t) => ({
+        parts: ot(o.parts, (t) => ({
           index: e(t.index),
           values: e(t.values)
         }))
@@ -1340,11 +1340,11 @@ function Eo(o) {
   }
   throw new Error(`unsupported resource type: ${or(o.resourceType)}`);
 }
-function Ot(o, e) {
+function xt(o, e) {
   const t = ge("sha256");
-  return t.update(je(o)), t.update(String(ce(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
+  return t.update(Ee(o)), t.update(String(ce(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
 }
-function xt(o, e = !0, t = !1, r = "") {
+function Dt(o, e = !0, t = !1, r = "") {
   var a, c, u;
   const s = /^(?<name>.*)\.(?<type>spec|data)$/, i = /* @__PURE__ */ new Map();
   for (const l of o.listInputFields()) {
@@ -1385,7 +1385,7 @@ function xt(o, e = !0, t = !1, r = "") {
 }
 function To(o, e = !0, t = "") {
   if (!o.getIsReadyOrError()) throw new Error("resource is not ready");
-  const r = xt(o, e, !1, t);
+  const r = Dt(o, e, !1, t);
   dr(r.locked);
   const s = {};
   for (const [i, n] of r.results) {
@@ -1396,14 +1396,14 @@ function To(o, e = !0, t = "") {
     if (a === void 0) throw new Error(`no data for key ${i}`);
     if (!a.ok) throw new ar(a.error);
     s[i] = {
-      id: Ot(n.spec, a.value),
+      id: xt(n.spec, a.value),
       spec: n.spec,
       data: a.value
     };
   }
   return s;
 }
-class Ne {
+class Le {
   constructor(e, t) {
     d(this, "allSpecsAvailable");
     this.ctx = e, this.blocks = t;
@@ -1455,7 +1455,7 @@ class Ne {
         u !== void 0 ? e.push({
           ref: ie(n, a),
           obj: {
-            id: u.ok ? Ot(c.spec, u.value) : void 0,
+            id: u.ok ? xt(c.spec, u.value) : void 0,
             spec: c.spec,
             data: u
           }
@@ -1509,7 +1509,7 @@ class Ne {
     for (const r of this.blocks.values()) {
       const s = /* @__PURE__ */ new Set(), i = (n) => {
         for (const [a, c] of n.results)
-          s.has(a) || c.spec === void 0 || (s.add(a), Ut(e, c.spec) && t.push({
+          s.has(a) || c.spec === void 0 || (s.add(a), $t(e, c.spec) && t.push({
             label: r.info.label + " / " + a,
             ref: ie(r.info.id, a),
             spec: c.spec
@@ -1520,10 +1520,10 @@ class Ne {
     return t;
   }
   static create(e, t, r) {
-    const s = e.accessor(t).node(), i = w(s.getKeyValueAsJson(_)), a = Re(i).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
+    const s = e.accessor(t).node(), i = w(s.getKeyValueAsJson(_)), a = Oe(i).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
     for (const u of V(i)) {
       if (!a.has(u.id)) continue;
-      const l = ot(
+      const l = st(
         s.traverse({
           field: C(u.id, "prodCtx"),
           ignoreError: !0,
@@ -1534,7 +1534,7 @@ class Ne {
           field: C(u.id, "prodUiCtx"),
           stableIfNotFound: !0
         })
-      ), p = ot(
+      ), p = st(
         s.traverse({
           field: C(u.id, "stagingCtx"),
           ignoreError: !0,
@@ -1546,21 +1546,21 @@ class Ne {
       );
       c.set(u.id, { info: u, prod: l, staging: p });
     }
-    return new Ne(e, c);
+    return new Le(e, c);
   }
 }
-function ot(o, e) {
+function st(o, e) {
   if (e === void 0)
     return o ? { locked: !1, results: /* @__PURE__ */ new Map() } : void 0;
-  if (e.ok) return xt(e.value, !1, !0);
+  if (e.ok) return Dt(e.value, !1, !0);
 }
-function Le(o, e) {
+function Je(o, e) {
   const t = o.persist(), r = w(
     o.traverse({
       field: C(e, "currentArgs"),
       errorIfFieldNotSet: !0
     }).getDataAsString()
-  ), s = o.getKeyValueAsString(ke(e));
+  ), s = o.getKeyValueAsString(Ce(e));
   return {
     blockId: e,
     args: r,
@@ -1572,10 +1572,10 @@ function Le(o, e) {
     }
   };
 }
-function Dt(o, e) {
+function jt(o, e) {
   const t = o.persist();
   return {
-    ...Le(o, e),
+    ...Je(o, e),
     prod: (r) => {
       var s;
       return (s = r.accessor(t).node({ ignoreError: !0 }).traverse({
@@ -1592,7 +1592,7 @@ function Dt(o, e) {
       })) == null ? void 0 : i.persist();
       return s === void 0 && r.markUnstable("staging_not_rendered"), s;
     },
-    getResultsPool: (r) => Ne.create(r, t, e)
+    getResultsPool: (r) => Le.create(r, t, e)
   };
 }
 function* j(o, e) {
@@ -1692,7 +1692,7 @@ const No = (o) => {
     return he((s = r.accessor(e).node().traverse(t)) == null ? void 0 : s.persist());
   };
 };
-function jt(o, e) {
+function Et(o, e) {
   const t = {}, r = o.length;
   for (let s = 0; s < r; s++) t[String(s)] = e(o[s]);
   return t;
@@ -1702,12 +1702,12 @@ function Ko(o, e) {
     const r = t.source;
     return r === void 0 ? h(void 0) : () => ({
       type: "ScheduleSubroutine",
-      subroutine: Et(r.length),
-      args: jt(r, (s) => m({ ...o, [e.itVar]: s }, e.mapping))
+      subroutine: Tt(r.length),
+      args: Et(r, (s) => m({ ...o, [e.itVar]: s }, e.mapping))
     });
   };
 }
-function Et(o) {
+function Tt(o) {
   return (e) => {
     const t = [];
     for (let r = 0; r < o; r++) t.push(e[String(r)]);
@@ -1859,7 +1859,7 @@ function m(o, e) {
     case "Isolate":
       return ({ drivers: r }) => ({
         type: "ScheduleComputable",
-        computable: Vt(r, o, e.cfg)
+        computable: Nt(r, o, e.cfg)
       });
     case "Immediate":
       return h(e.value);
@@ -1897,8 +1897,8 @@ function m(o, e) {
     case "MakeArray":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Et(e.template.length),
-        args: jt(e.template, (r) => m(o, r))
+        subroutine: Tt(e.template.length),
+        args: Et(e.template, (r) => m(o, r))
       });
     case "Flatten":
       return () => ({
@@ -2053,15 +2053,15 @@ function as(o) {
     $staging: o.staging
   };
 }
-const Tt = Symbol(), At = "return", cs = { op: Tt, arg: At };
+const At = Symbol(), It = "return", cs = { op: At, arg: It };
 function us(o) {
-  return o.op == Tt && o.arg == At;
+  return o.op == At && o.arg == It;
 }
 function ls() {
   return { pendingSubroutines: /* @__PURE__ */ new Map() };
 }
-function st(o, e, t, r) {
-  const s = new ht(t), i = (a, c) => {
+function it(o, e, t, r) {
+  const s = new ft(t), i = (a, c) => {
     if (us(a))
       return e.result = c, !1;
     const u = w(e.pendingSubroutines.get(a.op));
@@ -2112,11 +2112,11 @@ function st(o, e, t, r) {
   }
   return n;
 }
-function It(o, e, t, r = {}) {
-  return Vt(o, as(e), t, r);
-}
 function Vt(o, e, t, r = {}) {
-  const s = je({
+  return Nt(o, as(e), t, r);
+}
+function Nt(o, e, t, r = {}) {
+  const s = Ee({
     ctx: Object.fromEntries(Object.entries(e).filter(([i]) => ns.indexOf(i) === -1)),
     cfg: t
   });
@@ -2124,7 +2124,7 @@ function Vt(o, e, t, r = {}) {
     (i) => {
       const n = { drivers: o, cCtx: i }, a = ls();
       return {
-        ir: st(
+        ir: it(
           n,
           a,
           [
@@ -2151,7 +2151,7 @@ function Vt(o, e, t, r = {}) {
             result: a.result,
             pendingSubroutines: f
           };
-          if (st(g, v, p, !1), !("result" in v))
+          if (it(g, v, p, !1), !("result" in v))
             throw new Error("illegal cfg rendering stack state, no result");
           return v.result;
         }
@@ -2163,7 +2163,7 @@ function Vt(o, e, t, r = {}) {
 function ds(o) {
   return o instanceof ArrayBuffer || ArrayBuffer.isView(o);
 }
-function it(o) {
+function nt(o) {
   return o !== void 0 ? Buffer.from(o).toString("base64") : void 0;
 }
 class pe {
@@ -2203,7 +2203,7 @@ class pe {
   }
   runCallback(e, ...t) {
     try {
-      return Se.withScope((r) => {
+      return ke.withScope((r) => {
         const s = r.manage(this.vm.getProp(this.callbackRegistry, e));
         if (this.vm.typeof(s) !== "function")
           throw new Error(`No such callback: ${e}`);
@@ -2273,13 +2273,13 @@ class pe {
     return this.getAccessor(e).listDynamicFields();
   }
   getKeyValueBase64(e, t) {
-    return it(this.getAccessor(e).getKeyValue(t));
+    return nt(this.getAccessor(e).getKeyValue(t));
   }
   getKeyValueAsString(e, t) {
     return this.getAccessor(e).getKeyValueAsString(t);
   }
   getDataBase64(e) {
-    return it(this.getAccessor(e).getData());
+    return nt(this.getAccessor(e).getData());
   }
   getDataAsString(e) {
     return this.getAccessor(e).getDataAsString();
@@ -2421,7 +2421,7 @@ class pe {
         obj: {
           id: t.obj.id,
           spec: t.obj.spec,
-          data: $t(t.obj.data, (r) => this.wrapAccessor(r))
+          data: Gt(t.obj.data, (r) => this.wrapAccessor(r))
         }
       }))
     };
@@ -2449,7 +2449,7 @@ class pe {
         "can't instantiate PTable from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPTable(
-      ct(e, (t) => q(t, (r) => this.getAccessor(r))),
+      ut(e, (t) => q(t, (r) => this.getAccessor(r))),
       this.computableCtx
     );
   }
@@ -2531,7 +2531,7 @@ class pe {
       return JSON.parse(t);
   }
   injectCtx() {
-    Se.withScope((e) => {
+    ke.withScope((e) => {
       const t = e.manage(this.vm.newObject());
       this.vm.setProp(t, "args", e.manage(this.vm.newString(this.blockCtx.args))), this.blockCtx.uiState !== void 0 && this.vm.setProp(
         t,
@@ -2599,7 +2599,7 @@ class pe {
 }
 function ps(o, e, t, r, s = {}) {
   return P.makeRaw((i) => {
-    const n = new Se();
+    const n = new ke();
     i.addOnDestroy(() => n.dispose());
     const a = n.manage(o.quickJs.newRuntime());
     a.setMemoryLimit(1024 * 640), a.setMaxStackSize(1024 * 320);
@@ -2615,17 +2615,17 @@ function ps(o, e, t, r, s = {}) {
     };
   }, s);
 }
-function xe(o, e, t, r, s = {}) {
-  if (ut(t)) {
+function De(o, e, t, r, s = {}) {
+  if (lt(t)) {
     if (r === void 0) throw new Error("No code bundle.");
     return ps(o, e, t, r, s);
-  } else return It(o.driverKit, e, t, s);
+  } else return Vt(o.driverKit, e, t, s);
 }
 function gs(o, e, t) {
   return P.make(
     (r) => {
       var v, x, N, K, re, $, W, oe;
-      const s = r.accessor(o).node(), i = w(s.getKeyValueAsJson(Ie)), n = w(s.getKeyValueAsJson(X)), a = w(s.getKeyValueAsJson(ee)), c = w(s.getKeyValueAsJson(_)), u = w(
+      const s = r.accessor(o).node(), i = w(s.getKeyValueAsJson(Ve)), n = w(s.getKeyValueAsJson(X)), a = w(s.getKeyValueAsJson(ee)), c = w(s.getKeyValueAsJson(_)), u = w(
         s.getKeyValueAsJson(ue)
       ), l = /* @__PURE__ */ new Map();
       for (const { id: k } of V(c)) {
@@ -2662,7 +2662,7 @@ function gs(o, e, t) {
         l.set(k, { currentArguments: J.getDataAsJson(), prod: z });
       }
       const p = ne(c, (k) => l.get(k).currentArguments), g = new Set(u.blocksInLimbo), f = [...V(c)].map(({ id: k, label: J, renderingMode: z }) => {
-        var Ke, Me, Ue, $e;
+        var Me, Ue, $e, Ge;
         const E = w(l.get(k)), D = w(p.nodes.get(k));
         let B = "NotCalculated";
         E.prod !== void 0 && (g.has(k) ? B = "Limbo" : B = E.prod.finished ? "Done" : "Running");
@@ -2674,17 +2674,17 @@ function gs(o, e, t) {
           },
           { field: b.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 }
         ), L = M == null ? void 0 : M.getDataAsJson(), { sections: se, inputsValid: y, sdkVersion: R } = de(L == null ? void 0 : L.config, (fe) => {
-          const Y = De(fe), Ge = Le(s, k);
+          const Y = je(fe), He = Je(s, k);
           return {
-            sections: xe(
+            sections: De(
               t,
-              Ge,
+              He,
               Y.sections,
               Y.code
             ),
-            inputsValid: xe(
+            inputsValid: De(
               t,
-              Ge,
+              He,
               Y.inputsValid,
               Y.code
             ),
@@ -2698,14 +2698,14 @@ function gs(o, e, t) {
           id: k,
           label: J,
           renderingMode: z,
-          stale: ((Ke = E.prod) == null ? void 0 : Ke.stale) !== !1 || B === "Limbo",
+          stale: ((Me = E.prod) == null ? void 0 : Me.stale) !== !1 || B === "Limbo",
           missingReference: D.missingReferences,
           upstreams: [...p.traverseIdsExcludingRoots("upstream", k)],
           downstreams: [...p.traverseIdsExcludingRoots("downstream", k)],
           calculationStatus: B,
-          outputErrors: ((Me = E.prod) == null ? void 0 : Me.outputError) === !0,
-          outputsError: (Ue = E.prod) == null ? void 0 : Ue.outputsError,
-          exportsError: ($e = E.prod) == null ? void 0 : $e.exportsError,
+          outputErrors: ((Ue = E.prod) == null ? void 0 : Ue.outputError) === !0,
+          outputsError: ($e = E.prod) == null ? void 0 : $e.outputsError,
+          exportsError: (Ge = E.prod) == null ? void 0 : Ge.exportsError,
           sections: se,
           inputsValid: y,
           currentBlockPack: L == null ? void 0 : L.source,
@@ -2718,7 +2718,7 @@ function gs(o, e, t) {
         meta: a,
         created: new Date(i),
         lastModified: new Date(n),
-        authorMarker: s.getKeyValueAsJson(Pe),
+        authorMarker: s.getKeyValueAsJson(Fe),
         blocks: f
       };
     },
@@ -2737,7 +2737,7 @@ function gs(o, e, t) {
     }
   ).withStableType();
 }
-function Nt(o, e) {
+function Lt(o, e) {
   var t, r;
   return de(
     (r = (t = o.traverse(
@@ -2748,16 +2748,16 @@ function Nt(o, e) {
       },
       { field: b.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 }
     )) == null ? void 0 : t.getDataAsJson()) == null ? void 0 : r.config,
-    (s) => De(s)
+    (s) => je(s)
   );
 }
 function hs(o, e) {
   const t = o.node();
-  if (U(t.resourceType, kt)) {
+  if (U(t.resourceType, Ct)) {
     const r = t.getDataAsJson();
     if (r === void 0) throw new Error("No resource data.");
     return e.frontendDownloadDriver.getPath(new URL(r.url)).withStableType();
-  } else if (U(t.resourceType, Ct)) {
+  } else if (U(t.resourceType, Pt)) {
     const r = t.getDataAsJson();
     if (r === void 0) throw new Error("No resource data.");
     return e.signer.verify(
@@ -2787,13 +2787,13 @@ function ms(o, e, t) {
   return P.make(
     (r) => {
       var a;
-      const s = r.accessor(o).node(), i = Nt(s, e), n = (a = s.traverse(
+      const s = r.accessor(o).node(), i = Lt(s, e), n = (a = s.traverse(
         {
           field: C(e, "blockPack"),
           assertFieldType: "Dynamic"
         },
         { field: b.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 },
-        { field: Ft, assertFieldType: "Input" }
+        { field: Bt, assertFieldType: "Input" }
       )) == null ? void 0 : a.persist();
       return { path: fs(n, t), sdkVersion: i == null ? void 0 : i.sdkVersion };
     },
@@ -2803,30 +2803,30 @@ function ms(o, e, t) {
 function vs(o, e, t) {
   return P.make(
     (r) => {
-      const s = r.accessor(o).node(), i = Le(s, e);
+      const s = r.accessor(o).node(), i = Je(s, e);
       return {
-        author: s.getKeyValueAsJson(Ce(e)),
+        author: s.getKeyValueAsJson(Pe(e)),
         args: JSON.parse(i.args),
         ui: i.uiState !== void 0 ? JSON.parse(i.uiState) : void 0
       };
     },
-    { key: "inputs#" + pt(o.rid) + e }
+    { key: "inputs#" + gt(o.rid) + e }
   );
 }
 function ys(o, e, t) {
   return P.make(
     (r) => {
-      const s = r.accessor(o).node(), i = Dt(s, e), n = Nt(s, e);
+      const s = r.accessor(o).node(), i = jt(s, e), n = Lt(s, e);
       return de(n, (a) => {
         const c = {};
         for (const [u, l] of Object.entries(a.outputs))
           c[u] = P.wrapError(
-            xe(t, i, l, a.code)
+            De(t, i, l, a.code)
           );
         return c;
       });
     },
-    { key: "outputs#" + pt(o.rid) + e }
+    { key: "outputs#" + gt(o.rid) + e }
   ).withStableType();
 }
 function bs(o, e) {
@@ -2842,11 +2842,11 @@ function bs(o, e) {
         { field: b.HolderRefField, assertFieldType: "Input", errorIfFieldNotFound: !0 }
       ), u = c == null ? void 0 : c.getDataAsJson();
       if ((u == null ? void 0 : u.config) === void 0) continue;
-      const l = De(u.config), p = Object.entries(l.outputs).map(([, f]) => f).filter((f) => !ut(f) && Vo(f)).map((f) => f);
+      const l = je(u.config), p = Object.entries(l.outputs).map(([, f]) => f).filter((f) => !lt(f) && Vo(f)).map((f) => f);
       if (p.length === 0) continue;
-      const g = Dt(r, n);
+      const g = jt(r, n);
       for (const f of p)
-        i.push(P.wrapError(It(e.driverKit, g, f)));
+        i.push(P.wrapError(Vt(e.driverKit, g, f)));
     }
     return i;
   });
@@ -2858,14 +2858,14 @@ class ws {
   setState(e, t) {
     const r = this.states.get(e);
     if (r === void 0) {
-      this.states.set(e, { state: t, change: new We() });
+      this.states.set(e, { state: t, change: new ze() });
       return;
     }
     r.state = { ...t }, r.change.markChanged();
   }
   readState(e, t) {
     let r = this.states.get(t);
-    return r === void 0 && (r = { state: { ...Gt }, change: new We() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
+    return r === void 0 && (r = { state: { ...Ht }, change: new ze() }, this.states.set(t, r)), r.change.attachWatcher(e.watcher), r.state;
   }
   getState(e) {
     return P.make(
@@ -2878,7 +2878,7 @@ class ws {
     t !== void 0 && (this.states.delete(e), t.change.markChanged());
   }
 }
-class Je {
+class Ke {
   constructor(e, t, r) {
     /** Underlying pl resource id */
     d(this, "rid");
@@ -2900,7 +2900,7 @@ class Je {
   async refreshLoop() {
     for (; !this.destroyed; )
       try {
-        await be(this.env.pl, this.rid, (e) => {
+        await we(this.env.pl, this.rid, (e) => {
           e.doRefresh(this.env.ops.stagingRenderingRate);
         }), await this.activeConfigs.getValue(), await gr(this.env.ops.projectRefreshInterval, this.abortController.signal);
       } catch (e) {
@@ -3002,7 +3002,7 @@ class Je {
    * stale state.
    * */
   async runBlock(e) {
-    await be(this.env.pl, this.rid, (t) => t.renderProduction([e], !0)), await this.projectTree.refreshState();
+    await we(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
@@ -3010,7 +3010,7 @@ class Je {
    * calculated.
    * */
   async stopBlock(e) {
-    await be(this.env.pl, this.rid, (t) => t.stopProduction(e)), await this.projectTree.refreshState();
+    await we(this.env.pl, this.rid, (t) => t.stopProduction(e)), await this.projectTree.refreshState();
   }
   /** Update block label. */
   async setBlockLabel(e, t, r) {
@@ -3066,9 +3066,9 @@ class Je {
   /** Resets arguments and ui state of the block to initial state */
   async resetBlockArgsAndUiState(e, t) {
     await this.env.pl.withWriteTx("BlockInputsReset", async (r) => {
-      const s = we(
+      const s = Se(
         (await r.getField(S(this.rid, C(e, "blockPack")))).value
-      ), i = we(
+      ), i = Se(
         (await r.getField(S(s, b.HolderRefField))).value
       ), n = await r.getResourceData(i, !1), a = JSON.parse(
         Buffer.from(w(n.data)).toString("utf-8")
@@ -3135,14 +3135,14 @@ class Je {
     await this.destroy();
   }
   static async init(e, t) {
-    const r = await gt.init(e.pl, t, e.ops.defaultTreeOptions);
-    return new Je(e, t, r);
+    const r = await ht.init(e.pl, t, e.ops.defaultTreeOptions);
+    return new Ke(e, t, r);
   }
 }
-const Lt = {
+const Jt = {
   logger: new Qt(),
   platformLocalStorageNameToPath: {},
-  localStorageNameToPath: { local: ft.homedir() },
+  localStorageNameToPath: { local: mt.homedir() },
   blobDriverOps: {
     cacheSoftSizeBytes: 100 * 1024 * 1024,
     // 100MB
@@ -3160,7 +3160,7 @@ const Lt = {
     stopPollingDelay: 1e3
   }
 }, Ss = {
-  ...Lt,
+  ...Jt,
   defaultTreeOptions: {
     pollingInterval: 350,
     stopPollingDelay: 2500
@@ -3184,7 +3184,7 @@ class Ps extends cr {
       case "dev-v2":
         return `dev_2_${t.folder}_${t.mtime}`;
       case "from-registry-v2":
-        return `from_registry_v2_${t.registryUrl}_${t.id.organization}_${t.id.name}`;
+        return `from_registry_v2_${t.registryUrl}_${t.id.organization}_${t.id.name}_${t.id.version}`;
       default:
         return Cs;
     }
@@ -3195,7 +3195,7 @@ class Ps extends cr {
       switch (t.type) {
         case "dev-v1":
           try {
-            const s = await vt(t.folder);
+            const s = await yt(t.folder);
             return s === t.mtime ? void 0 : { ...t, mtime: s };
           } catch (s) {
             this.logger.warn(s);
@@ -3203,9 +3203,9 @@ class Ps extends cr {
           }
         case "dev-v2":
           try {
-            const s = await lt(t.folder);
+            const s = await dt(t.folder, this.logger);
             if (s === void 0) return;
-            const i = await Ae(s);
+            const i = await Ie(s);
             return i === t.mtime ? void 0 : { ...t, mtime: i };
           } catch (s) {
             this.logger.warn(s);
@@ -3215,7 +3215,7 @@ class Ps extends cr {
           try {
             const i = (r = await this.registryProvider.getRegistry(t.registryUrl).getOverviewForSpec(t.id)) == null ? void 0 : r.spec;
             if ((i == null ? void 0 : i.type) !== "from-registry-v2") throw new Error("Unexpected");
-            return Ht(i.id, t.id) ? void 0 : i;
+            return me(i.id, t.id) ? void 0 : i;
           } catch (s) {
             this.logger.warn(s);
             return;
@@ -3223,19 +3223,29 @@ class Ps extends cr {
         default:
           return;
       }
-    } catch {
+    } catch (s) {
+      this.logger.warn(s);
       return;
     }
   }
   resultsEqual(t, r) {
     if (t === void 0 && r === void 0) return !0;
-    if (t === void 0 || r === void 0) return !1;
-    if (t.type === "from-registry-v1" || r.type === "from-registry-v1" || t.type === "from-registry-v2" || r.type === "from-registry-v2")
-      throw new Error("Unexpected, not yet supported.");
-    return t.folder === r.folder && t.mtime === r.mtime;
+    if (t === void 0 || r === void 0 || t.type !== r.type) return !1;
+    switch (t.type) {
+      case "from-registry-v1":
+        return r.type !== "from-registry-v1" ? !1 : t.registryUrl === r.registryUrl && me(t.id, r.id);
+      case "from-registry-v2":
+        return r.type !== "from-registry-v2" ? !1 : t.registryUrl === r.registryUrl && me(t.id, r.id);
+      case "dev-v1":
+        return r.type !== "dev-v1" ? !1 : t.folder === r.folder && t.mtime === r.mtime;
+      case "dev-v2":
+        return r.type !== "dev-v2" ? !1 : t.folder === r.folder && t.mtime === r.mtime;
+      default:
+        O(t);
+    }
   }
 }
-class nt {
+class at {
   constructor() {
     d(this, "resources", /* @__PURE__ */ new Map());
   }
@@ -3270,7 +3280,7 @@ class nt {
     return (t = this.resources.get(e)) == null ? void 0 : t.resource;
   }
 }
-function at(o) {
+function ct(o) {
   return String(o.id);
 }
 class Fs {
@@ -3288,8 +3298,8 @@ class Fs {
     });
     this.blobDriver = e, this.columns = t, this.pFrame.setDataSource(this);
     for (const r of t) {
-      for (const i of Fo(r.data)) this.blobIdToResource.set(at(i), i);
-      const s = Bo(r.data, at);
+      for (const i of Fo(r.data)) this.blobIdToResource.set(ct(i), i);
+      const s = Bo(r.data, ct);
       try {
         this.pFrame.addColumnSpec(r.id, r.spec), this.pFrame.setColumnData(r.id, s);
       } catch (i) {
@@ -3315,7 +3325,7 @@ class Bs {
   constructor(e) {
     d(this, "pFrames");
     d(this, "pTables");
-    this.blobDriver = e, this.pFrames = new class extends nt {
+    this.blobDriver = e, this.pFrames = new class extends at {
       constructor(t) {
         super(), this.blobDriver = t;
       }
@@ -3325,7 +3335,7 @@ class Bs {
       calculateParamsKey(t) {
         return Os(t);
       }
-    }(this.blobDriver), this.pTables = new class extends nt {
+    }(this.blobDriver), this.pTables = new class extends at {
       constructor(t) {
         super(), this.pFrames = t;
       }
@@ -3349,7 +3359,7 @@ class Bs {
     return t.addOnDestroy(s.unref), s.key;
   }
   createPTable(e, t) {
-    const r = this.createPFrame(xs(e.src), t), s = ct(e, (n) => n.id), i = this.pTables.acquire({ def: s, pFrameHandle: r });
+    const r = this.createPFrame(xs(e.src), t), s = ut(e, (n) => n.id), i = this.pTables.acquire({ def: s, pFrameHandle: r });
     return t.addOnDestroy(i.unref), i.key;
   }
   //
@@ -3429,7 +3439,7 @@ function Q(o) {
 }
 function Rs(o) {
   const e = ge("sha256");
-  return e.update(o.pFrameHandle), e.update(je(o.def)), e.digest().toString("hex");
+  return e.update(o.pFrameHandle), e.update(Ee(o.def)), e.digest().toString("hex");
 }
 function Os(o) {
   const e = o.map((s) => s.id).sort(), t = ge("sha256");
@@ -3460,9 +3470,9 @@ function ae(o, e) {
   }
 }
 async function Ds(o, e) {
-  const t = { ...Lt, ...e };
+  const t = { ...Jt, ...e };
   js(t.logger, t);
-  const r = new dt(t.localSecret), s = hr(t.logger, o, t.platformLocalStorageNameToPath), i = fr(o, t.logger), n = mr(o, t.logger), a = vr(o, t.logger), c = yr(o, t.logger), u = new br(
+  const r = new pt(t.localSecret), s = hr(t.logger, o, t.platformLocalStorageNameToPath), i = fr(o, t.logger), n = mr(o, t.logger), a = vr(o, t.logger), c = yr(o, t.logger), u = new br(
     t.logger,
     s,
     i,
@@ -3486,7 +3496,7 @@ async function Ds(o, e) {
   };
 }
 function js(o, e) {
-  e.localStorageNameToPath.local != ft.homedir() && o.warn(`'local' storage with homedir was overwrote: ${e.localStorageNameToPath.local}`);
+  e.localStorageNameToPath.local != mt.homedir() && o.warn(`'local' storage with homedir was overwrote: ${e.localStorageNameToPath.local}`);
   const t = Object.keys(e.platformLocalStorageNameToPath), r = Object.keys(e.localStorageNameToPath).find(
     (s) => t.includes(s)
   );
@@ -3495,7 +3505,7 @@ function js(o, e) {
       `Platform local storages include one or more local storages:  ${r}. Note that we automatically included 'local' storage with user's home directory.`
     );
 }
-class Jt {
+class Kt {
   constructor(e, t, r, s, i, n, a, c) {
     d(this, "pl");
     /** Contains a reactive list of projects along with their meta information. */
@@ -3548,7 +3558,7 @@ class Jt {
   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 Je.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
+    this.openedProjectsByRid.set(t, await Ke.init(this.env, t)), this.openedProjectsList.setValue([...this.openedProjectsByRid.keys()]);
   }
   /** Closes the project, and deallocate all corresponding resources. */
   async closeProject(e) {
@@ -3576,7 +3586,7 @@ class Jt {
   /** Generates sufficiently random string to be used as local secret for the
    * middle layer */
   static generateLocalSecret() {
-    return dt.generateSecret();
+    return pt.generateSecret();
   }
   /** Initialize middle layer */
   static async init(e, t) {
@@ -3585,7 +3595,7 @@ class Jt {
       v.createField(x, "Dynamic");
       const N = await v.getField(x);
       if (ce(N.value)) {
-        const K = v.createEphemeral(wt);
+        const K = v.createEphemeral(St);
         return v.lock(K), v.setField(x, K), await v.commit(), await K.globalId;
       } else
         return N.value;
@@ -3613,7 +3623,7 @@ class Jt {
       }),
       quickJs: await pr()
     }, g = new ur([]), f = await Wr(e, s, g, p);
-    return new Jt(
+    return new Kt(
       p,
       n,
       n.signer,
@@ -3628,12 +3638,12 @@ class Jt {
 export {
   ei as BlockPackRegistry,
   ti as CentralBlockRegistry,
-  Lt as DefaultDriverKitOps,
+  Jt as DefaultDriverKitOps,
   Ss as DefaultMiddleLayerOps,
-  Ct as FrontendFromFolderResourceType,
-  kt as FrontendFromUrlResourceType,
-  Jt as MiddleLayer,
-  Je as Project,
+  Pt as FrontendFromFolderResourceType,
+  Ct as FrontendFromUrlResourceType,
+  Kt as MiddleLayer,
+  Ke as Project,
   oo as TengoTemplateGet,
   so as TengoTemplateGetRegistry,
   no as TengoTemplateGetTemplate,
@@ -3645,11 +3655,11 @@ export {
   oi as V1CentralDevSnapshotRegistry,
   ri as V1CentralRegistry,
   Tr as V2RegistryProvider,
-  St as createRenderTemplate,
-  vt as getDevV1PacketMtime,
-  Ae as getDevV2PacketMtime,
+  kt as createRenderTemplate,
+  yt as getDevV1PacketMtime,
+  Ie as getDevV2PacketMtime,
   Ds as initDriverKit,
-  Ve as loadTemplate,
+  Ne as loadTemplate,
   po as prepareTemplateSpec
 };
 //# sourceMappingURL=index.mjs.map