@milaboratories/pl-middle-layer 1.23.5 → 1.23.7

package/dist/index.mjs

@@ -6,10 +6,10 @@ export * from "@platforma-sdk/model";
 import { AnyChannel as ke, StableChannel as ne, blockPackIdToString as Jt, blockPackIdEquals as Gt } from "@milaboratories/pl-model-middle-layer";
 export * from "@milaboratories/pl-model-middle-layer";
 import { request as ie, RetryAgent as Cs } from "undici";
-import { RegistryV1 as ue, tryLoadPackDescription as ht, BlockPackMetaEmbedAbsoluteBytes as ks, RegistryV2Reader as Ps, folderReaderByUrl as Os, loadPackDescription as Mt } from "@platforma-sdk/block-tools";
+import { RegistryV1 as ue, tryLoadPackDescription as ht, BlockPackMetaEmbedAbsoluteBytes as ks, RegistryV2Reader as Ps, folderReaderByUrl as $s, loadPackDescription as Mt } from "@platforma-sdk/block-tools";
 import q from "node:fs";
 import H from "node:path";
-import $s from "yaml";
+import Os from "yaml";
 import { assertNever as J, notEmpty as B, ConsoleLoggerAdapter as Is, ConcurrencyLimitingExecutor as Fs, HmacSha256Signer as Lr } from "@milaboratories/ts-helpers";
 import * as Nr from "node:fs/promises";
 import { tryResolve as Ts } from "@milaboratories/resolve-helper";
@@ -91,7 +91,7 @@ async function Ur(s) {
   }
   return e.toString();
 }
-async function Ot(s) {
+async function $t(s) {
   const e = await q.promises.stat(s.components.workflow.main.file, {
     bigint: !0
   }), t = await q.promises.stat(s.components.model.file, { bigint: !0 });
@@ -162,7 +162,7 @@ class Vl {
             H.join(a, ue.PlPackageYamlConfigFile)
           );
           if (l !== void 0) {
-            const u = ue.PlPackageConfigData.parse($s.parse(l)), d = await Ur(a), m = {
+            const u = ue.PlPackageConfigData.parse(Os.parse(l)), d = await Ur(a), m = {
               organization: u.organization,
               name: u.package,
               version: "DEV"
@@ -198,7 +198,7 @@ class Vl {
                 if (u = H.join(a, m), d = await ht(u), d !== void 0) break;
             }
             if (d !== void 0) {
-              const m = await Ot(d), h = {
+              const m = await $t(d), h = {
                 id: d.id,
                 meta: await ks.parseAsync(d.meta),
                 spec: {
@@ -249,7 +249,7 @@ class go {
   getRegistry(e) {
     const t = this.registries.get(e);
     if (t) return t;
-    const r = new Ps(Os(e, this.http));
+    const r = new Ps($s(e, this.http));
     return this.registries.set(e, r), r;
   }
 }
@@ -269,7 +269,7 @@ const Ul = {
   blocksInLimbo: []
 }, yo = {
   label: "New Project"
-}, wo = { name: "UserProject", version: "2" }, Jr = "SchemaVersion", Gr = "1", $t = "ProjectCreated", Te = "ProjectLastModified", Ae = "ProjectMeta", de = "ProjectStructure", Ke = "BlockRenderingState", So = "BlockFrontendState/", bo = /^BlockFrontendState\/(?<blockid>.*)$/;
+}, wo = { name: "UserProject", version: "2" }, Jr = "SchemaVersion", Gr = "1", Ot = "ProjectCreated", Te = "ProjectLastModified", Ae = "ProjectMeta", de = "ProjectStructure", Ke = "BlockRenderingState", So = "BlockFrontendState/", bo = /^BlockFrontendState\/(?<blockid>.*)$/;
 function mt(s) {
   return `${So}${s}`;
 }
@@ -297,14 +297,14 @@ function Po(s) {
   const { blockId: t, fieldName: r } = e.groups;
   return { blockId: t, fieldName: r };
 }
-const Oo = "projects", Mr = { name: "Projects", version: "1" }, $o = (s) => ae(s.type, Mr) ? s.fields : [];
+const $o = "projects", Mr = { name: "Projects", version: "1" }, Oo = (s) => ae(s.type, Mr) ? s.fields : [];
 async function Io(s, e, t, r) {
   const o = await Br.init(
     s,
     e,
     {
       ...r.ops.defaultTreeOptions,
-      pruning: $o
+      pruning: Oo
     },
     r.logger
   );
@@ -315,7 +315,7 @@ async function Io(s, e, t, r) {
     for (const u of c.listDynamicFields()) {
       const d = c.traverse(u);
       if (d === void 0) continue;
-      const m = B(d.getKeyValueAsJson(Ae)), h = B(d.getKeyValueAsJson($t)), f = B(d.getKeyValueAsJson(Te));
+      const m = B(d.getKeyValueAsJson(Ae)), h = B(d.getKeyValueAsJson(Ot)), f = B(d.getKeyValueAsJson(Te));
       l.push({
         id: u,
         rid: d.id,
@@ -567,7 +567,7 @@ class qo {
         ), o = await q.promises.readFile(
           t.components.workflow.main.file
         ), n = t.components.ui.folder, i = { ...e };
-        return e.mtime === void 0 && (i.mtime = await Ot(t)), {
+        return e.mtime === void 0 && (i.mtime = await $t(t)), {
           type: "explicit",
           template: {
             type: "explicit",
@@ -1326,7 +1326,7 @@ async function sn(s, e = yo) {
   const t = s.createEphemeral(wo);
   s.lock(t);
   const r = String(Date.now());
-  s.setKValue(t, Jr, JSON.stringify(Gr)), s.setKValue(t, $t, r), s.setKValue(t, Te, r), s.setKValue(t, Ae, JSON.stringify(e)), s.setKValue(t, de, JSON.stringify(mo)), s.setKValue(t, Ke, JSON.stringify(vo));
+  s.setKValue(t, Jr, JSON.stringify(Gr)), s.setKValue(t, Ot, r), s.setKValue(t, Te, r), s.setKValue(t, Ae, JSON.stringify(e)), s.setKValue(t, de, JSON.stringify(mo)), s.setKValue(t, Ke, JSON.stringify(vo));
   const o = await Zr();
   return s.createField(
     j(t, wt(o.hash)),
@@ -1829,7 +1829,7 @@ function vn(s, e) {
   for (const [r, o] of Object.entries(s)) t[r] = e(o);
   return t;
 }
-function Oe(s, e) {
+function $e(s, e) {
   return s === void 0 ? void 0 : e(s);
 }
 function yn(s) {
@@ -1882,7 +1882,7 @@ function En(s, e) {
     return r === void 0 ? C(void 0) : () => ({
       type: "ScheduleSubroutine",
       subroutine: rs(r.length),
-      args: ts(r, (o) => O({ ...s, [e.itVar]: o }, e.mapping))
+      args: ts(r, (o) => $({ ...s, [e.itVar]: o }, e.mapping))
     });
   };
 }
@@ -1900,7 +1900,7 @@ function Cn(s, e) {
     const o = {};
     for (const [n, i] of Object.entries(r)) {
       const c = { ...s, [e.itVar]: i };
-      o[n] = O(c, e.mapping);
+      o[n] = $(c, e.mapping);
     }
     return () => ({
       type: "ScheduleSubroutine",
@@ -1912,10 +1912,10 @@ function Cn(s, e) {
 const kn = (s) => C(s), Pn = (s) => {
   const e = s.arg;
   return C(e === void 0 ? void 0 : e.length === 0);
-}, On = (s) => {
+}, $n = (s) => {
   const e = s.operand;
   return C(e === void 0 ? void 0 : !e);
-}, $n = (s) => {
+}, On = (s) => {
   const e = s.operand1, t = s.operand2;
   return C(e === void 0 || t === void 0 ? void 0 : e && t);
 }, In = (s) => {
@@ -1941,7 +1941,7 @@ function An(s, e) {
         if (a === void 0) i[c] = C(void 0);
         else {
           const l = { ...s, [e.itVar]: a.persist() };
-          i[c] = O(l, e.mapping);
+          i[c] = $(l, e.mapping);
         }
       }
       return {
@@ -2030,7 +2030,7 @@ const Ln = (s) => C(s), Nn = (s) => {
     computable: t.logDriver.getLogHandle(e)
   });
 };
-function O(s, e) {
+function $(s, e) {
   switch (e.type) {
     case "GetFromCtx":
       const t = s[e.variable];
@@ -2047,8 +2047,8 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Tn,
         args: {
-          source: O(s, e.source),
-          field: O(s, e.field)
+          source: $(s, e.source),
+          field: $(s, e.field)
         }
       });
     case "MapArrayValues":
@@ -2056,7 +2056,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: En(s, e),
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "MapRecordValues":
@@ -2064,27 +2064,27 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Cn(s, e),
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "MakeObject":
       return () => ({
         type: "ScheduleSubroutine",
         subroutine: Sn,
-        args: vn(e.template, (r) => O(s, r))
+        args: vn(e.template, (r) => $(s, r))
       });
     case "MakeArray":
       return () => ({
         type: "ScheduleSubroutine",
         subroutine: rs(e.template.length),
-        args: ts(e.template, (r) => O(s, r))
+        args: ts(e.template, (r) => $(s, r))
       });
     case "Flatten":
       return () => ({
         type: "ScheduleSubroutine",
         subroutine: bn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "IsEmpty":
@@ -2092,24 +2092,24 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Pn,
         args: {
-          arg: O(s, e.arg)
+          arg: $(s, e.arg)
         }
       });
     case "Not":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: On,
+        subroutine: $n,
         args: {
-          operand: O(s, e.operand)
+          operand: $(s, e.operand)
         }
       });
     case "And":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: $n,
+        subroutine: On,
         args: {
-          operand1: O(s, e.operand1),
-          operand2: O(s, e.operand2)
+          operand1: $(s, e.operand1),
+          operand2: $(s, e.operand2)
         }
       });
     case "Or":
@@ -2117,8 +2117,8 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: In,
         args: {
-          operand1: O(s, e.operand1),
-          operand2: O(s, e.operand2)
+          operand1: $(s, e.operand1),
+          operand2: $(s, e.operand2)
         }
       });
     case "MapResourceFields":
@@ -2126,7 +2126,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: An(s, e),
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetResourceField":
@@ -2134,8 +2134,8 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Rn,
         args: {
-          source: O(s, e.source),
-          field: O(s, e.field)
+          source: $(s, e.source),
+          field: $(s, e.field)
         }
       });
     case "GetResourceValueAsJson":
@@ -2143,7 +2143,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Fn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetBlobContent":
@@ -2151,7 +2151,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Nn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetBlobContentAsString":
@@ -2159,7 +2159,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Dn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetBlobContentAsJson":
@@ -2167,7 +2167,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Bn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetDownloadedBlobContent":
@@ -2175,7 +2175,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: jn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetOnDemandBlobContent":
@@ -2183,7 +2183,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: xn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetImportProgress":
@@ -2191,7 +2191,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Vn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetLastLogs":
@@ -2199,7 +2199,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Un(e.lines),
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetProgressLog":
@@ -2207,7 +2207,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Jn(e.patternToSearch),
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     case "GetLogHandle":
@@ -2215,7 +2215,7 @@ function O(s, e) {
         type: "ScheduleSubroutine",
         subroutine: Gn,
         args: {
-          source: O(s, e.source)
+          source: $(s, e.source)
         }
       });
     default:
@@ -2314,7 +2314,7 @@ function ns(s, e, t, r = {}) {
           [
             {
               destination: Kn,
-              operation: O(e, t)
+              operation: $(e, t)
             }
           ],
           !0
@@ -2821,7 +2821,7 @@ class ze {
   }
 }
 function qe(s, e) {
-  return Oe(
+  return $e(
     s.traverse(
       {
         field: U(e, "blockPack"),
@@ -2864,7 +2864,7 @@ function qn(s, e, t, r, o, n = {}) {
 function Yn(s) {
   return Ar(s) ? s.isActive === !0 : wn(s);
 }
-function $e(s, e, t, r, o, n = {}) {
+function Oe(s, e, t, r, o, n = {}) {
   if (Ar(t)) {
     if (r === void 0) throw new Error("No code bundle.");
     return qn(s, e, t, r, o, n);
@@ -2874,7 +2874,7 @@ function Zn(s, e, t) {
   return V.make(
     (r) => {
       var f, I, F, D, _, k, se, pe;
-      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson($t)), i = B(o.getKeyValueAsJson(Te)), c = B(o.getKeyValueAsJson(Ae)), a = B(o.getKeyValueAsJson(de)), l = B(
+      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(Ot)), i = B(o.getKeyValueAsJson(Te)), c = B(o.getKeyValueAsJson(Ae)), a = B(o.getKeyValueAsJson(de)), l = B(
         o.getKeyValueAsJson(Ke)
       ), u = /* @__PURE__ */ new Map();
       for (const { id: A } of te(a)) {
@@ -2915,38 +2915,38 @@ function Zn(s, e, t) {
         const K = B(u.get(A)), G = B(d.nodes.get(A));
         let x = "NotCalculated";
         K.prod !== void 0 && (m.has(A) ? x = "Limbo" : x = K.prod.finished ? "Done" : "Running");
-        const X = qe(o, A), { sections: he, title: v, inputsValid: p, sdkVersion: y } = Oe(X, ({ bpId: $, cfg: L, info: N }) => {
+        const X = qe(o, A), { sections: he, title: v, inputsValid: p, sdkVersion: y } = $e(X, ({ bpId: O, cfg: L, info: N }) => {
           const re = Tt(s, A);
           return {
-            sections: $e(
+            sections: Oe(
               t,
               re,
               L.sections,
               L.code,
-              $
+              O
             ),
-            title: Oe(
+            title: $e(
               L.title,
-              (vs) => $e(
+              (vs) => Oe(
                 t,
                 re,
                 vs,
                 L.code,
-                $
+                O
               )
             ),
-            inputsValid: $e(
+            inputsValid: Oe(
               t,
               re,
               L.inputsValid,
               L.code,
-              $
+              O
             ),
             sdkVersion: L.sdkVersion
           };
-        }) || {}, g = Oe(
+        }) || {}, g = $e(
           X,
-          ({ info: $ }) => t.blockUpdateWatcher.get($.source)
+          ({ info: O }) => t.blockUpdateWatcher.get(O.source)
         );
         return {
           id: A,
@@ -3060,10 +3060,10 @@ function ri(s, e, t) {
   return V.make(
     (r) => {
       const o = r.accessor(s).node(), n = es(s, e);
-      return Oe(qe(o, e), ({ cfg: i, bpId: c }) => {
+      return $e(qe(o, e), ({ cfg: i, bpId: c }) => {
         const a = {};
         for (const [l, u] of Object.entries(i.outputs)) {
-          const d = $e(t, n, u, i.code, c);
+          const d = Oe(t, n, u, i.code, c);
           a[l] = V.wrapError(d);
         }
         return a;
@@ -3083,7 +3083,7 @@ function si(s, e) {
       const u = es(r.persist(), i);
       for (const d of l)
         n.push(
-          V.wrapError($e(e, u, d, a.cfg.code, a.bpId))
+          V.wrapError(Oe(e, u, d, a.cfg.code, a.bpId))
         );
     }
     return n;
@@ -3661,8 +3661,8 @@ const ki = we, Pi = (s, e) => {
   const t = ki(s.trim().replace(/^[=v]+/, ""), e);
   return t ? t.version : null;
 };
-var Oi = Pi;
-const dr = M, $i = (s, e, t, r, o) => {
+var $i = Pi;
+const dr = M, Oi = (s, e, t, r, o) => {
   typeof t == "string" && (o = r, r = t, t = void 0);
   try {
     return new dr(
@@ -3673,7 +3673,7 @@ const dr = M, $i = (s, e, t, r, o) => {
     return null;
   }
 };
-var Ii = $i;
+var Ii = Oi;
 const pr = we, Fi = (s, e) => {
   const t = pr(s, null, !0), r = pr(e, null, !0), o = t.compare(r);
   if (o === 0)
@@ -3770,7 +3770,7 @@ const Ea = M, Ca = we, { safeRe: Je, t: Ge } = De, ka = (s, e) => {
   return Ca(`${r}.${o}.${n}${i}${c}`, e);
 };
 var Pa = ka;
-class Oa {
+class $a {
   constructor() {
     this.max = 1e3, this.map = /* @__PURE__ */ new Map();
   }
@@ -3793,7 +3793,7 @@ class Oa {
     return this;
   }
 }
-var $a = Oa, it, gr;
+var Oa = $a, it, gr;
 function Z() {
   if (gr) return it;
   gr = 1;
@@ -3846,8 +3846,8 @@ function Z() {
       p = p.replace(R, X(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(a[l.COMPARATORTRIM], u), i("comparator trim", p), p = p.replace(a[l.TILDETRIM], d), i("tilde trim", p), p = p.replace(a[l.CARETTRIM], m), i("caret trim", p);
       let P = p.split(" ").map((N) => _(N, this.options)).join(" ").split(/\s+/).map((N) => x(N, this.options));
       w && (P = P.filter((N) => (i("loose invalid filter", N, this.options), !!N.match(a[l.COMPARATORLOOSE])))), i("range list", P);
-      const E = /* @__PURE__ */ new Map(), $ = P.map((N) => new n(N, this.options));
-      for (const N of $) {
+      const E = /* @__PURE__ */ new Map(), O = P.map((N) => new n(N, this.options));
+      for (const N of O) {
         if (I(N))
           return [N];
         E.set(N.value, N);
@@ -3878,7 +3878,7 @@ function Z() {
     }
   }
   it = e;
-  const t = $a, r = new t(), o = Lt, n = et(), i = Ze, c = M, {
+  const t = Oa, r = new t(), o = Lt, n = et(), i = Ze, c = M, {
     safeRe: a,
     t: l,
     comparatorTrimReplace: u,
@@ -3903,18 +3903,18 @@ function Z() {
     const y = p.loose ? a[l.CARETLOOSE] : a[l.CARET], g = p.includePrerelease ? "-0" : "";
     return v.replace(y, (b, w, R, P, E) => {
       i("caret", v, b, w, R, P, E);
-      let $;
-      return k(w) ? $ = "" : k(R) ? $ = `>=${w}.0.0${g} <${+w + 1}.0.0-0` : k(P) ? w === "0" ? $ = `>=${w}.${R}.0${g} <${w}.${+R + 1}.0-0` : $ = `>=${w}.${R}.0${g} <${+w + 1}.0.0-0` : E ? (i("replaceCaret pr", E), w === "0" ? R === "0" ? $ = `>=${w}.${R}.${P}-${E} <${w}.${R}.${+P + 1}-0` : $ = `>=${w}.${R}.${P}-${E} <${w}.${+R + 1}.0-0` : $ = `>=${w}.${R}.${P}-${E} <${+w + 1}.0.0-0`) : (i("no pr"), w === "0" ? R === "0" ? $ = `>=${w}.${R}.${P}${g} <${w}.${R}.${+P + 1}-0` : $ = `>=${w}.${R}.${P}${g} <${w}.${+R + 1}.0-0` : $ = `>=${w}.${R}.${P} <${+w + 1}.0.0-0`), i("caret return", $), $;
+      let O;
+      return k(w) ? O = "" : k(R) ? O = `>=${w}.0.0${g} <${+w + 1}.0.0-0` : k(P) ? w === "0" ? O = `>=${w}.${R}.0${g} <${w}.${+R + 1}.0-0` : O = `>=${w}.${R}.0${g} <${+w + 1}.0.0-0` : E ? (i("replaceCaret pr", E), w === "0" ? R === "0" ? O = `>=${w}.${R}.${P}-${E} <${w}.${R}.${+P + 1}-0` : O = `>=${w}.${R}.${P}-${E} <${w}.${+R + 1}.0-0` : O = `>=${w}.${R}.${P}-${E} <${+w + 1}.0.0-0`) : (i("no pr"), w === "0" ? R === "0" ? O = `>=${w}.${R}.${P}${g} <${w}.${R}.${+P + 1}-0` : O = `>=${w}.${R}.${P}${g} <${w}.${+R + 1}.0-0` : O = `>=${w}.${R}.${P} <${+w + 1}.0.0-0`), i("caret return", O), O;
     });
   }, oe = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((y) => K(y, p)).join(" ")), K = (v, p) => {
     v = v.trim();
     const y = p.loose ? a[l.XRANGELOOSE] : a[l.XRANGE];
     return v.replace(y, (g, b, w, R, P, E) => {
       i("xRange", v, g, b, w, R, P, E);
-      const $ = k(w), L = $ || k(R), N = L || k(P), re = N;
-      return b === "=" && re && (b = ""), E = p.includePrerelease ? "-0" : "", $ ? b === ">" || b === "<" ? g = "<0.0.0-0" : g = "*" : b && re ? (L && (R = 0), P = 0, b === ">" ? (b = ">=", L ? (w = +w + 1, R = 0, P = 0) : (R = +R + 1, P = 0)) : b === "<=" && (b = "<", L ? w = +w + 1 : R = +R + 1), b === "<" && (E = "-0"), g = `${b + w}.${R}.${P}${E}`) : L ? g = `>=${w}.0.0${E} <${+w + 1}.0.0-0` : N && (g = `>=${w}.${R}.0${E} <${w}.${+R + 1}.0-0`), i("xRange return", g), g;
+      const O = k(w), L = O || k(R), N = L || k(P), re = N;
+      return b === "=" && re && (b = ""), E = p.includePrerelease ? "-0" : "", O ? b === ">" || b === "<" ? g = "<0.0.0-0" : g = "*" : b && re ? (L && (R = 0), P = 0, b === ">" ? (b = ">=", L ? (w = +w + 1, R = 0, P = 0) : (R = +R + 1, P = 0)) : b === "<=" && (b = "<", L ? w = +w + 1 : R = +R + 1), b === "<" && (E = "-0"), g = `${b + w}.${R}.${P}${E}`) : L ? g = `>=${w}.0.0${E} <${+w + 1}.0.0-0` : N && (g = `>=${w}.${R}.0${E} <${w}.${+R + 1}.0-0`), i("xRange return", g), g;
     });
-  }, G = (v, p) => (i("replaceStars", v, p), v.trim().replace(a[l.STAR], "")), x = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(a[p.includePrerelease ? l.GTE0PRE : l.GTE0], "")), X = (v) => (p, y, g, b, w, R, P, E, $, L, N, re) => (k(g) ? y = "" : k(b) ? y = `>=${g}.0.0${v ? "-0" : ""}` : k(w) ? y = `>=${g}.${b}.0${v ? "-0" : ""}` : R ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, k($) ? E = "" : k(L) ? E = `<${+$ + 1}.0.0-0` : k(N) ? E = `<${$}.${+L + 1}.0-0` : re ? E = `<=${$}.${L}.${N}-${re}` : v ? E = `<${$}.${L}.${+N + 1}-0` : E = `<=${E}`, `${y} ${E}`.trim()), he = (v, p, y) => {
+  }, G = (v, p) => (i("replaceStars", v, p), v.trim().replace(a[l.STAR], "")), x = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(a[p.includePrerelease ? l.GTE0PRE : l.GTE0], "")), X = (v) => (p, y, g, b, w, R, P, E, O, L, N, re) => (k(g) ? y = "" : k(b) ? y = `>=${g}.0.0${v ? "-0" : ""}` : k(w) ? y = `>=${g}.${b}.0${v ? "-0" : ""}` : R ? y = `>=${y}` : y = `>=${y}${v ? "-0" : ""}`, k(O) ? E = "" : k(L) ? E = `<${+O + 1}.0.0-0` : k(N) ? E = `<${O}.${+L + 1}.0-0` : re ? E = `<=${O}.${L}.${N}-${re}` : v ? E = `<${O}.${L}.${+N + 1}-0` : E = `<=${E}`, `${y} ${E}`.trim()), he = (v, p, y) => {
     for (let g = 0; g < v.length; g++)
       if (!v[g].test(p))
         return !1;
@@ -4180,7 +4180,7 @@ const br = Z(), Vt = et(), { ANY: lt } = Vt, be = tt, Ut = Y, pc = (s, e, t = {}
   return r < 0 ? s : r > 0 || e.operator === "<" && s.operator === "<=" ? e : s;
 };
 var gc = pc;
-const ut = De, kr = Ye, mc = M, Pr = ds, vc = we, yc = Ci, wc = Oi, Sc = Ii, bc = Ti, Rc = Ni, Ec = ji, Cc = Ui, kc = Mi, Pc = Y, Oc = Wi, $c = qi, Ic = Nt, Fc = ea, Tc = sa, Ac = Qe, Lc = Dt, Nc = ps, Dc = hs, Bc = Bt, jc = jt, xc = fs, Vc = Pa, Uc = et(), Jc = Z(), Gc = tt, Mc = La, _c = ja, Kc = Ja, Hc = _a, Wc = Wa, zc = xt, Xc = sc, qc = ic, Yc = cc, Zc = dc, Qc = gc;
+const ut = De, kr = Ye, mc = M, Pr = ds, vc = we, yc = Ci, wc = $i, Sc = Ii, bc = Ti, Rc = Ni, Ec = ji, Cc = Ui, kc = Mi, Pc = Y, $c = Wi, Oc = qi, Ic = Nt, Fc = ea, Tc = sa, Ac = Qe, Lc = Dt, Nc = ps, Dc = hs, Bc = Bt, jc = jt, xc = fs, Vc = Pa, Uc = et(), Jc = Z(), Gc = tt, Mc = La, _c = ja, Kc = Ja, Hc = _a, Wc = Wa, zc = xt, Xc = sc, qc = ic, Yc = cc, Zc = dc, Qc = gc;
 var el = {
   parse: vc,
   valid: yc,
@@ -4192,8 +4192,8 @@ var el = {
   patch: Cc,
   prerelease: kc,
   compare: Pc,
-  rcompare: Oc,
-  compareLoose: $c,
+  rcompare: $c,
+  compareLoose: Oc,
   compareBuild: Ic,
   sort: Fc,
   rsort: Tc,
@@ -4265,7 +4265,7 @@ class ol extends Gs {
           try {
             const r = await ht(t.folder, this.logger);
             if (r === void 0) return;
-            const o = await Ot(r);
+            const o = await $t(r);
             return o === t.mtime ? void 0 : { ...t, mtime: o };
           } catch (r) {
             this.logger.warn(r);
@@ -4333,7 +4333,7 @@ class ol extends Gs {
     }
   }
 }
-class Or {
+class $r {
   constructor() {
     S(this, "resources", /* @__PURE__ */ new Map());
   }
@@ -4374,7 +4374,7 @@ function ve() {
     logPFrameRequests: process.env.MI_LOG_PFRAMES !== void 0
   }, process.env.MI_LOG_TREE_STAT && (Re.logTreeStats = process.env.MI_LOG_TREE_STAT === "cumulative" ? "cumulative" : "per-request"), Re);
 }
-function $r(s) {
+function Or(s) {
   return String(s.id);
 }
 const nl = ["Int", "Long", "Float", "Double", "String", "Bytes"];
@@ -4418,8 +4418,8 @@ class il {
     });
     this.blobDriver = e, this.blobContentCache = t, this.columns = r, this.pFrame.setDataSource(this);
     for (const o of r) {
-      for (const i of on(o.data)) this.blobIdToResource.set($r(i), i);
-      const n = nn(o.data, $r);
+      for (const i of on(o.data)) this.blobIdToResource.set(Or(i), i);
+      const n = nn(o.data, Or);
       try {
         this.pFrame.addColumnSpec(o.id, o.spec), this.pFrame.setColumnData(o.id, n);
       } catch (i) {
@@ -4455,25 +4455,25 @@ class al {
       fetchMethod: async (n) => await Nr.readFile(n),
       sizeCalculation: (n) => n.length
     }), o = new Fs(1);
-    this.blobContentCache = r, this.concurrencyLimiter = o, this.pFrames = new class extends Or {
+    this.blobContentCache = r, this.concurrencyLimiter = o, this.pFrames = new class extends $r {
       constructor(n) {
         super(), this.blobDriver = n;
       }
       createNewResource(n) {
         return ve().logPFrameRequests && t.info(
-          `Create PFrame (${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
+          `PFrame creation (pFrameHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
         ), new il(this.blobDriver, r, n);
       }
       calculateParamsKey(n) {
         return ll(n);
       }
-    }(this.blobDriver), this.pTables = new class extends Or {
+    }(this.blobDriver), this.pTables = new class extends $r {
       constructor(n) {
         super(), this.pFrames = n;
       }
       async createNewResource(n) {
         const i = this.pFrames.getByKey(n.pFrameHandle), c = await o.run(async () => (ve().logPFrameRequests && t.info(
-          `Create PTable (${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
+          `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ee)}`
         ), await i.pFrame.createTable({
           src: Ie(n.def.src),
           filters: dt(n.def.filters)
@@ -4498,15 +4498,13 @@ class al {
     return t.addOnDestroy(o.unref), o.key;
   }
   createPTable(e, t) {
-    const r = this.createPFrame(Es(e.src), t);
-    ve().logPFrameRequests && this.logger.info(
-      `Create PTable call (${r}): ${JSON.stringify(
+    const r = this.createPFrame(Es(e.src), t), o = pt(e, (i) => i.id), n = this.pTables.acquire({ def: o, pFrameHandle: r });
+    return ve().logPFrameRequests && this.logger.info(
+      `Create PTable call (pFrameHandle = ${r}; pTableHandle = ${n}): ${JSON.stringify(
         pt(e, (i) => i.spec),
         Ee
       )}`
-    );
-    const o = pt(e, (i) => i.id), n = this.pTables.acquire({ def: o, pFrameHandle: r });
-    return t.addOnDestroy(n.unref), n.key;
+    ), t.addOnDestroy(n.unref), n.key;
   }
   //
   // PFrame istance methods
@@ -4534,7 +4532,7 @@ class al {
   }
   async calculateTableData(e, t) {
     let r = await this.concurrencyLimiter.run(async () => (ve().logPFrameRequests && this.logger.info(
-      `calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
+      `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
     ), await this.pFrames.getByKey(e).pFrame.createTable({
       src: Ie(t.src),
       filters: dt(t.filters)
@@ -4555,7 +4553,7 @@ class al {
   }
   async getUniqueValues(e, t) {
     return await this.concurrencyLimiter.run(async () => (ve().logPFrameRequests && this.logger.info(
-      `getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
+      `Call getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Ee)}`
     ), await this.pFrames.getByKey(e).pFrame.getUniqueValues({
       ...t,
       filters: dt(t.filters)
@@ -4603,7 +4601,7 @@ function Ie(s) {
 }
 function cl(s) {
   const e = Ne("sha256");
-  return e.update(ye(s.def)), e.digest().toString("hex");
+  return e.update(ye(s)), e.digest().toString("hex");
 }
 function ll(s) {
   const e = [...s].map(
@@ -4778,7 +4776,7 @@ class ms {
     };
     o.defaultTreeOptions.logStat = ve().logTreeStats;
     const n = await e.withWriteTx("MLInitialization", async (I) => {
-      const F = j(I.clientRoot, Oo);
+      const F = j(I.clientRoot, $o);
       I.createField(F, "Dynamic");
       const D = await I.getField(F);
       if (_e(D.value)) {
@@ -5058,7 +5056,7 @@ export {
   Wl as checkNetwork,
   _r as createRenderTemplate,
   Ur as getDevV1PacketMtime,
-  Ot as getDevV2PacketMtime,
+  $t as getDevV2PacketMtime,
   ul as initDriverKit,
   It as loadTemplate,
   Ho as prepareTemplateSpec