@milaboratories/pl-middle-layer 1.29.1 → 1.29.3

package/dist/index.mjs

@@ -32,16 +32,16 @@ import { AnyChannel as Se, StableChannel as ce, InitialBlockSettings as zt, bloc
 export * from "@milaboratories/pl-model-middle-layer";
 export * from "@milaboratories/pl-deployments";
 import { request as Ft, RetryAgent as Ds } from "undici";
-import { RegistryV1 as pe, tryLoadPackDescription as vt, BlockPackMetaEmbedAbsoluteBytes as Ns, RegistryV2Reader as Bs, folderReaderByUrl as xs, loadPackDescription as qt } from "@platforma-sdk/block-tools";
+import { RegistryV1 as pe, tryLoadPackDescription as vt, BlockPackMetaEmbedAbsoluteBytes as Ns, RegistryV2Reader as Bs, folderReaderByUrl as xs, loadPackDescription as Xt } from "@platforma-sdk/block-tools";
 import Y from "node:fs";
 import _ from "node:path";
 import js from "yaml";
 import { assertNever as K, notEmpty as B, ConsoleLoggerAdapter as Vs, ConcurrencyLimitingExecutor as Us, HmacSha256Signer as Gr } from "@milaboratories/ts-helpers";
 import * as Mr from "node:fs/promises";
 import { tryResolve as Js } from "@milaboratories/resolve-helper";
-import { resourceTypesEqual as le, field as x, Pl as A, PlClient as Gs, isNullResourceId as Xe, ensureResourceIdNotNull as yt, isResource as Ms, isResourceRef as _s, isNotNullResourceId as Xt, resourceType as Le, resourceTypeToString as Ks, resourceIdToString as _r, isNotFoundError as Hs, isTimeoutOrCancelError as Ws, toGlobalResourceId as zs, plAddressToConfig as qs, UnauthenticatedPlClient as Yt } from "@milaboratories/pl-client";
+import { resourceTypesEqual as le, field as x, Pl as A, PlClient as Gs, isNullResourceId as qe, ensureResourceIdNotNull as yt, isResource as Ms, isResourceRef as _s, isNotNullResourceId as qt, resourceType as Le, resourceTypeToString as Ks, resourceIdToString as _r, isNotFoundError as Hs, isTimeoutOrCancelError as Ws, toGlobalResourceId as zs, plAddressToConfig as Xs, UnauthenticatedPlClient as Yt } from "@milaboratories/pl-client";
 export * from "@milaboratories/pl-client";
-import { SynchronizedTreeState as Kr, PlError as Xs, isPlTreeNodeAccessor as Ys } from "@milaboratories/pl-tree";
+import { SynchronizedTreeState as Kr, PlError as qs, isPlTreeNodeAccessor as Ys } from "@milaboratories/pl-tree";
 import { Computable as J, ChangeSource as Qt, PollComputablePool as Qs, WatchableValue as Zs } from "@milaboratories/computable";
 import { randomUUID as Ie, createHash as De } from "node:crypto";
 import { parseTemplate as eo, PlTemplateV1 as ae, PlTemplateOverrideV1 as at, PlTemplateLibV1 as je, PlTemplateSoftwareV1 as be } from "@milaboratories/pl-model-backend";
@@ -65,12 +65,12 @@ async function er(s) {
     throw e;
   }
 }
-const yo = [pe.PlPackageYamlConfigFile], So = [pe.PlPackageJsonConfigFile], It = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], At = ["config", "dist", "config.json"], qr = ["frontend", "dist"], tr = "block-model/dist/config.json", wo = "block-ui/package.json", bo = [
+const yo = [pe.PlPackageYamlConfigFile], So = [pe.PlPackageJsonConfigFile], It = ["backend", "dist", "tengo", "tpl", "main.plj.gz"], At = ["config", "dist", "config.json"], Xr = ["frontend", "dist"], tr = "block-model/dist/config.json", wo = "block-ui/package.json", bo = [
   It,
   At,
   yo,
   So,
-  qr
+  Xr
 ];
 async function Ro(s) {
   return await er(_.join(s, ...At)) !== void 0 || await er(_.join(s, ...It)) !== void 0;
@@ -85,7 +85,7 @@ async function rr(s, e) {
     return {
       workflow: _.join(s, ...It),
       config: _.join(s, ...At),
-      ui: _.join(s, ...qr)
+      ui: _.join(s, ...Xr)
     };
   {
     const t = ct(s, tr), r = ct(s, tr), o = ct(s, wo);
@@ -110,7 +110,7 @@ async function Eo(s) {
     throw e;
   }
 }
-async function Xr(s) {
+async function qr(s) {
   let e = 0n;
   for (const t of bo) {
     const r = _.join(s, ...t), o = await Eo(r);
@@ -190,7 +190,7 @@ class Ql {
             _.join(n, pe.PlPackageYamlConfigFile)
           );
           if (i !== void 0) {
-            const a = pe.PlPackageConfigData.parse(js.parse(i)), c = await Xr(n), u = {
+            const a = pe.PlPackageConfigData.parse(js.parse(i)), c = await qr(n), u = {
               organization: a.organization,
               name: a.package,
               version: "DEV"
@@ -389,7 +389,7 @@ function zo(s, e) {
   const t = eo(e.content), r = t.type;
   switch (r) {
     case "pl.tengo-template.v2":
-      return qo(s, t);
+      return Xo(s, t);
     default:
       K(r);
   }
@@ -454,7 +454,7 @@ const nr = {
     return e.createField(n, "Service"), e.setField(n, r), e.lock(o), o;
   }
 };
-function qo(s, e) {
+function Xo(s, e) {
   const t = /* @__PURE__ */ new Map(), r = (o, n) => {
     const i = De("sha256");
     n.hash(o, i);
@@ -467,7 +467,7 @@ function qo(s, e) {
   };
   return r(e, ts);
 }
-const Xo = { name: "TengoTemplateGet", version: "1" }, Yo = "registry", Qo = "templateURI", Zo = "template", ru = { name: "TengoTemplatePack", version: "1" }, su = {
+const qo = { name: "TengoTemplateGet", version: "1" }, Yo = "registry", Qo = "templateURI", Zo = "template", ru = { name: "TengoTemplatePack", version: "1" }, su = {
   name: "TengoTemplatePackConvert",
   version: "1"
 }, ou = "templatePack", nu = "template";
@@ -486,7 +486,7 @@ async function en(s) {
   }
 }
 function tn(s, e) {
-  const t = s.createStruct(Xo), r = x(t, Yo), o = x(t, Qo), n = x(t, Zo);
+  const t = s.createStruct(qo), r = x(t, Yo), o = x(t, Qo), n = x(t, Zo);
   return s.setField(r, s.createValue(A.JsonString, Buffer.from(JSON.stringify(e.registry)))), s.setField(o, s.createValue(A.JsonString, Buffer.from(JSON.stringify(e.path)))), n;
 }
 function Dt(s, e) {
@@ -554,7 +554,7 @@ class nn {
         return JSON.parse(r);
       }
       case "dev-v2": {
-        const t = await qt(e.folder), r = await Y.promises.readFile(t.components.model.file, {
+        const t = await Xt(e.folder), r = await Y.promises.readFile(t.components.model.file, {
           encoding: "utf-8"
         });
         return JSON.parse(r);
@@ -595,7 +595,7 @@ class nn {
         };
       }
       case "dev-v2": {
-        const t = await qt(e.folder), r = JSON.parse(
+        const t = await Xt(e.folder), r = JSON.parse(
           await Y.promises.readFile(t.components.model.file, {
             encoding: "utf-8"
           })
@@ -750,7 +750,7 @@ function Pt(s) {
   }
   return t !== void 0 && (t.downstream = /* @__PURE__ */ new Set()), new is(e);
 }
-function qe(s, e) {
+function Xe(s, e) {
   const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
   for (const { id: o } of oe(s)) {
     const n = e(o);
@@ -920,13 +920,13 @@ class Qe {
     return this.stagingGraph === void 0 && (this.stagingGraph = Pt(this.struct)), this.stagingGraph;
   }
   getPendingProductionGraph() {
-    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = qe(
+    return this.pendingProductionGraph === void 0 && (this.pendingProductionGraph = Xe(
       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 = Xe(
       this.struct,
       (e) => this.getBlockInfo(e).actualProductionInputs
     )), this.actualProductionGraph;
@@ -1079,7 +1079,7 @@ class Qe {
   //
   /** Very generic method, better check for more specialized case-specific methods first. */
   updateStructure(e, t = pn) {
-    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = Pt(e), i = qe(
+    const r = this.getStagingGraph(), o = this.getActualProductionGraph(), n = Pt(e), i = Xe(
       e,
       (u) => {
         var l;
@@ -1308,16 +1308,16 @@ class Qe {
       y === void 0 && (y = {
         id: m.blockId,
         fields: {}
-      }, $.set(m.blockId, y)), y.fields[m.fieldName] = Xe(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
+      }, $.set(m.blockId, y)), y.fields[m.fieldName] = qe(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
     }
     const G = await as(), fe = Ct(G.hash), L = d.fields.find(
       (p) => p.name === fe
     );
-    let q;
-    L !== void 0 ? q = yt(L.value) : (q = A.wrapInHolder(e, Dt(e, G.spec)), e.createField(
+    let X;
+    L !== void 0 ? X = yt(L.value) : (X = A.wrapInHolder(e, Dt(e, G.spec)), e.createField(
       x(t, Ct(G.hash)),
       "Dynamic",
-      q
+      X
     ));
     const ie = { stagingRefreshTimestamp: D }, W = new Set(T), M = /* @__PURE__ */ new Map();
     for (const p of j) {
@@ -1335,17 +1335,17 @@ class Qe {
     });
     for (const [p, m] of V) {
       const y = await m;
-      p.value = y.data, Xt(y.error) ? p.status = "Error" : y.resourceReady || Xt(y.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
+      p.value = y.data, qt(y.error) ? p.status = "Error" : y.resourceReady || qt(y.originalResourceId) ? p.status = "Ready" : p.status = "NotReady";
     }
-    const X = /* @__PURE__ */ new Map();
-    $.forEach(({ id: p, fields: m }) => X.set(p, new lr(p, m)));
+    const q = /* @__PURE__ */ new Map();
+    $.forEach(({ id: p, fields: m }) => q.set(p, new lr(p, m)));
     const ge = /* @__PURE__ */ new Set();
     for (const p of oe(g)) {
-      if (!X.has(p.id))
+      if (!q.has(p.id))
         throw new Error(`Inconsistent project structure: no inputs for ${p.id}`);
       ge.add(p.id);
     }
-    X.forEach((p) => {
+    q.forEach((p) => {
       if (!ge.has(p.id))
         throw new Error(`Inconsistent project structure: no structure entry for ${p.id}`);
       p.check();
@@ -1360,9 +1360,9 @@ class Qe {
       g,
       ie,
       W,
-      X,
+      q,
       M,
-      q
+      X
     );
     return v.fixProblemsAndMigrate(), v;
   }
@@ -1549,7 +1549,7 @@ function Rn(s, e) {
 }
 function Cn(s, e) {
   const t = De("sha256");
-  return t.update(Z(s)), t.update(String(Xe(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
+  return t.update(Z(s)), t.update(String(qe(e.originalId) ? e.id : e.originalId)), t.digest().toString("hex");
 }
 function dr(s, e) {
   return Z({ __isRef: !0, blockId: s, name: e });
@@ -1606,7 +1606,7 @@ function Pn(s, e = !0, t = "", r) {
       throw new Error(`no data for key ${i}`);
     const c = a.data();
     if (c === void 0) throw new Error(`no data for key ${i}`);
-    if (!c.ok) throw new Xs(c.error);
+    if (!c.ok) throw new qs(c.error);
     n[i] = {
       id: r.length === 0 ? Cn(a.spec, c.value) : En(r, i),
       spec: a.spec,
@@ -2073,13 +2073,13 @@ const Gn = (s) => P(s), Mn = (s) => {
     type: "ScheduleComputable",
     computable: r.blobToURLDriver.extractArchiveAndGetURL(t, s)
   });
-}, qn = (s) => {
+}, Xn = (s) => {
   const e = s.source;
   return e === void 0 ? P(void 0) : ({ drivers: t }) => ({
     type: "ScheduleComputable",
     computable: t.uploadDriver.getProgressId(e)
   });
-}, Xn = (s) => (e) => {
+}, qn = (s) => (e) => {
   const t = e.source;
   return t === void 0 ? P(void 0) : ({ drivers: r }) => ({
     type: "ScheduleComputable",
@@ -2272,7 +2272,7 @@ function k(s, e) {
     case "GetImportProgress":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: qn,
+        subroutine: Xn,
         args: {
           source: k(s, e.source)
         }
@@ -2280,7 +2280,7 @@ function k(s, e) {
     case "GetLastLogs":
       return () => ({
         type: "ScheduleSubroutine",
-        subroutine: Xn(e.lines),
+        subroutine: qn(e.lines),
         args: {
           source: k(s, e.source)
         }
@@ -2993,7 +2993,7 @@ function li(s, e, t) {
         o.getKeyValueAsJson(Ye)
       ), l = /* @__PURE__ */ new Map();
       for (const { id: L } of oe(c)) {
-        const q = o.traverse({
+        const X = o.traverse({
           field: U(L, "currentArgs"),
           assertFieldType: "Dynamic",
           errorIfFieldNotSet: !0
@@ -3016,21 +3016,21 @@ function li(s, e, t) {
           });
           ie = {
             arguments: W.getDataAsJson(),
-            stale: q.id !== W.id,
+            stale: X.id !== W.id,
             outputError: M.error !== void 0 || V.error !== void 0 || ((C = M.value) == null ? void 0 : C.getError()) !== void 0 || ((g = V.value) == null ? void 0 : g.getError()) !== void 0,
             outputsError: ((D = M.error) == null ? void 0 : D.getDataAsString()) ?? ((j = (T = M.value) == null ? void 0 : T.getError()) == null ? void 0 : j.getDataAsString()),
             exportsError: (($ = V.error) == null ? void 0 : $.getDataAsString()) ?? ((fe = (G = V.value) == null ? void 0 : G.getError()) == null ? void 0 : fe.getDataAsString()),
             finished: (M.value !== void 0 && M.value.getIsReadyOrError() || M.error !== void 0 && M.error.getIsReadyOrError()) && (V.value !== void 0 && V.value.getIsReadyOrError() || V.error !== void 0 && V.error.getIsReadyOrError())
           };
         }
-        l.set(L, { currentArguments: q.getDataAsJson(), prod: ie });
+        l.set(L, { currentArguments: X.getDataAsJson(), prod: ie });
       }
-      const d = qe(c, (L) => l.get(L).currentArguments), f = new Set(u.blocksInLimbo), h = [...oe(c)].map(({ id: L, label: q, renderingMode: ie }) => {
+      const d = Xe(c, (L) => l.get(L).currentArguments), f = new Set(u.blocksInLimbo), h = [...oe(c)].map(({ id: L, label: X, renderingMode: ie }) => {
         var S, R, O, E, I;
         const W = B(l.get(L)), M = B(d.nodes.get(L));
         let V = "NotCalculated";
         W.prod !== void 0 && (f.has(L) ? V = "Limbo" : V = W.prod.finished ? "Done" : "Running");
-        const X = tt(o, L), { sections: ge, title: v, inputsValid: p, sdkVersion: m } = Oe(X, ({ bpId: N, cfg: F }) => {
+        const q = tt(o, L), { sections: ge, title: v, inputsValid: p, sdkVersion: m } = Oe(q, ({ bpId: N, cfg: F }) => {
           const ne = Bt(s, L);
           return {
             sections: $e(
@@ -3064,13 +3064,13 @@ function li(s, e, t) {
           assertFieldType: "Dynamic",
           errorIfFieldNotSet: !0
         }).getDataAsJson(), b = Oe(
-          X,
+          q,
           ({ info: N }) => t.blockUpdateWatcher.get({ currentSpec: N.source, settings: y })
         );
         return {
           id: L,
-          label: v ?? q,
-          title: v ?? q,
+          label: v ?? X,
+          title: v ?? X,
           renderingMode: ie,
           stale: ((S = W.prod) == null ? void 0 : S.stale) !== !1 || V === "Limbo",
           missingReference: M.missingReferences,
@@ -3084,7 +3084,7 @@ function li(s, e, t) {
           sections: ge,
           inputsValid: p,
           updateInfo: {},
-          currentBlockPack: (I = X == null ? void 0 : X.info) == null ? void 0 : I.source,
+          currentBlockPack: (I = q == null ? void 0 : q.info) == null ? void 0 : I.source,
           updates: b,
           sdkVersion: m,
           navigationState: e.getState(L)
@@ -3847,8 +3847,8 @@ const Mi = H, _i = (s, e) => new Mi(s, e).major;
 var Ki = _i;
 const Hi = H, Wi = (s, e) => new Hi(s, e).minor;
 var zi = Wi;
-const qi = H, Xi = (s, e) => new qi(s, e).patch;
-var Yi = Xi;
+const Xi = H, qi = (s, e) => new Xi(s, e).patch;
+var Yi = qi;
 const Qi = we, Zi = (s, e) => {
   const t = Qi(s, e);
   return t && t.prerelease.length ? t.prerelease : null;
@@ -4001,7 +4001,7 @@ function te() {
       if (b)
         return b;
       const S = this.options.loose, R = S ? c[u.HYPHENRANGELOOSE] : c[u.HYPHENRANGE];
-      p = p.replace(R, X(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[u.COMPARATORTRIM], l), i("comparator trim", p), p = p.replace(c[u.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[u.CARETTRIM], f), i("caret trim", p);
+      p = p.replace(R, q(this.options.includePrerelease)), i("hyphen replace", p), p = p.replace(c[u.COMPARATORTRIM], l), i("comparator trim", p), p = p.replace(c[u.TILDETRIM], d), i("tilde trim", p), p = p.replace(c[u.CARETTRIM], f), i("caret trim", p);
       let O = p.split(" ").map((F) => j(F, this.options)).join(" ").split(/\s+/).map((F) => V(F, this.options));
       S && (O = O.filter((F) => (i("loose invalid filter", F, this.options), !!F.match(c[u.COMPARATORLOOSE])))), i("range list", O);
       const E = /* @__PURE__ */ new Map(), I = O.map((F) => new n(F, this.options));
@@ -4056,7 +4056,7 @@ function te() {
       let E;
       return $(b) ? E = "" : $(S) ? E = `>=${b}.0.0 <${+b + 1}.0.0-0` : $(R) ? E = `>=${b}.${S}.0 <${b}.${+S + 1}.0-0` : O ? (i("replaceTilde pr", O), E = `>=${b}.${S}.${R}-${O} <${b}.${+S + 1}.0-0`) : E = `>=${b}.${S}.${R} <${b}.${+S + 1}.0-0`, i("tilde return", E), E;
     });
-  }, L = (v, p) => v.trim().split(/\s+/).map((m) => q(m, p)).join(" "), q = (v, p) => {
+  }, L = (v, p) => v.trim().split(/\s+/).map((m) => X(m, p)).join(" "), X = (v, p) => {
     i("caret", v, p);
     const m = p.loose ? c[u.CARETLOOSE] : c[u.CARET], y = p.includePrerelease ? "-0" : "";
     return v.replace(m, (b, S, R, O, E) => {
@@ -4072,7 +4072,7 @@ function te() {
       const I = $(S), N = I || $(R), F = N || $(O), ne = F;
       return b === "=" && ne && (b = ""), E = p.includePrerelease ? "-0" : "", I ? b === ">" || b === "<" ? y = "<0.0.0-0" : y = "*" : b && ne ? (N && (R = 0), O = 0, b === ">" ? (b = ">=", N ? (S = +S + 1, R = 0, O = 0) : (R = +R + 1, O = 0)) : b === "<=" && (b = "<", N ? S = +S + 1 : R = +R + 1), b === "<" && (E = "-0"), y = `${b + S}.${R}.${O}${E}`) : N ? y = `>=${S}.0.0${E} <${+S + 1}.0.0-0` : F && (y = `>=${S}.${R}.0${E} <${S}.${+R + 1}.0-0`), i("xRange return", y), y;
     });
-  }, M = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[u.STAR], "")), V = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? u.GTE0PRE : u.GTE0], "")), X = (v) => (p, m, y, b, S, R, O, E, I, N, F, ne) => ($(y) ? m = "" : $(b) ? m = `>=${y}.0.0${v ? "-0" : ""}` : $(S) ? m = `>=${y}.${b}.0${v ? "-0" : ""}` : R ? m = `>=${m}` : m = `>=${m}${v ? "-0" : ""}`, $(I) ? E = "" : $(N) ? E = `<${+I + 1}.0.0-0` : $(F) ? E = `<${I}.${+N + 1}.0-0` : ne ? E = `<=${I}.${N}.${F}-${ne}` : v ? E = `<${I}.${N}.${+F + 1}-0` : E = `<=${E}`, `${m} ${E}`.trim()), ge = (v, p, m) => {
+  }, M = (v, p) => (i("replaceStars", v, p), v.trim().replace(c[u.STAR], "")), V = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(c[p.includePrerelease ? u.GTE0PRE : u.GTE0], "")), q = (v) => (p, m, y, b, S, R, O, E, I, N, F, ne) => ($(y) ? m = "" : $(b) ? m = `>=${y}.0.0${v ? "-0" : ""}` : $(S) ? m = `>=${y}.${b}.0${v ? "-0" : ""}` : R ? m = `>=${m}` : m = `>=${m}${v ? "-0" : ""}`, $(I) ? E = "" : $(N) ? E = `<${+I + 1}.0.0-0` : $(F) ? E = `<${I}.${+N + 1}.0-0` : ne ? E = `<=${I}.${N}.${F}-${ne}` : v ? E = `<${I}.${N}.${+F + 1}-0` : E = `<=${E}`, `${m} ${E}`.trim()), ge = (v, p, m) => {
     for (let y = 0; y < v.length; y++)
       if (!v[y].test(p))
         return !1;
@@ -4159,15 +4159,15 @@ const Ka = H, Ha = te(), Wa = (s, e, t) => {
   }), r;
 };
 var za = Wa;
-const qa = H, Xa = te(), Ya = (s, e, t) => {
+const Xa = H, qa = te(), Ya = (s, e, t) => {
   let r = null, o = null, n = null;
   try {
-    n = new Xa(e, t);
+    n = new qa(e, t);
   } catch {
     return null;
   }
   return s.forEach((i) => {
-    n.test(i) && (!r || o.compare(i) === 1) && (r = i, o = new qa(r, t));
+    n.test(i) && (!r || o.compare(i) === 1) && (r = i, o = new Xa(r, t));
   }), r;
 };
 var Qa = Ya;
@@ -4338,7 +4338,7 @@ const Ir = te(), _t = nt(), { ANY: ft } = _t, Re = it, Kt = ee, Cc = (s, e, t =
   return r < 0 ? s : r > 0 || e.operator === "<" && s.operator === "<=" ? e : s;
 };
 var kc = Cc;
-const gt = Ne, Dr = rt, Oc = H, Nr = ws, $c = we, Fc = Ni, Ic = ji, Ac = Ui, Tc = Gi, Lc = Ki, Dc = zi, Nc = Yi, Bc = ea, xc = ee, jc = oa, Vc = aa, Uc = Vt, Jc = da, Gc = fa, Mc = ot, _c = Ut, Kc = bs, Hc = Rs, Wc = Jt, zc = Gt, qc = Cs, Xc = xa, Yc = nt(), Qc = te(), Zc = it, el = _a, tl = za, rl = Qa, sl = tc, ol = oc, nl = Mt, il = fc, al = vc, cl = Sc, ll = Rc, ul = kc;
+const gt = Ne, Dr = rt, Oc = H, Nr = ws, $c = we, Fc = Ni, Ic = ji, Ac = Ui, Tc = Gi, Lc = Ki, Dc = zi, Nc = Yi, Bc = ea, xc = ee, jc = oa, Vc = aa, Uc = Vt, Jc = da, Gc = fa, Mc = ot, _c = Ut, Kc = bs, Hc = Rs, Wc = Jt, zc = Gt, Xc = Cs, qc = xa, Yc = nt(), Qc = te(), Zc = it, el = _a, tl = za, rl = Qa, sl = tc, ol = oc, nl = Mt, il = fc, al = vc, cl = Sc, ll = Rc, ul = kc;
 var dl = {
   parse: $c,
   valid: Fc,
@@ -4361,8 +4361,8 @@ var dl = {
   neq: Hc,
   gte: Wc,
   lte: zc,
-  cmp: qc,
-  coerce: Xc,
+  cmp: Xc,
+  coerce: qc,
   Comparator: Yc,
   Range: Qc,
   satisfies: Zc,
@@ -4415,7 +4415,7 @@ class gl extends Qs {
       switch (n.type) {
         case "dev-v1":
           try {
-            const i = await Xr(n.folder);
+            const i = await qr(n.folder);
             return i === n.mtime ? { suggestions: [] } : { mainSuggestion: { ...n, mtime: i }, suggestions: [] };
           } catch (i) {
             return this.logger.warn(i), { suggestions: [] };
@@ -4709,29 +4709,39 @@ class Sl {
         super(), this.pFrames = n;
       }
       createNewResource(n) {
-        const i = n.pFrameHandle, a = o.run(async () => {
-          if (se().logPFrameRequests && t.info(
-            `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Pe)}`
-          ), se().usePFrameRs && xr(n.def.filters))
-            return await this.pFrames.getByKey(i).rustPFrame.createTable({
-              src: de(n.def.src),
-              filters: Ee(n.def.filters)
-            }, n.signal);
-          var c = [];
+        const i = n.pFrameHandle;
+        se().logPFrameRequests && t.info(
+          `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Pe)}`
+        );
+        const a = (async () => se().usePFrameRs && xr(n.def.filters) ? this.pFrames.getByKey(i).rustPFrame.createTable({
+          src: de(n.def.src),
+          filters: Ee(n.def.filters)
+        }, n.signal).then(async (c) => {
+          if (n.def.sorting.length > 0) {
+            const u = await c.sort(n.def.sorting, n.signal);
+            return c.dispose(), u;
+          }
+          return c;
+        }) : o.run(async () => {
+          var u = [];
           try {
-            const f = Be(c, this.pFrames.getByKey(i).disposableDataPFrame);
-            return await f.dataPFrame.createTable({
+            const c = Be(u, this.pFrames.getByKey(i).disposableDataPFrame);
+            return await c.dataPFrame.createTable({
               src: de(n.def.src),
               filters: Ee(n.def.filters)
             }, n.signal);
-          } catch (u) {
-            var l = u, d = !0;
+          } catch (l) {
+            var d = l, f = !0;
           } finally {
-            xe(c, l, d);
+            xe(u, d, f);
           }
-        }).then(
-          async (c) => n.def.sorting.length !== 0 ? await c.sort(n.def.sorting, n.signal) : c
-        );
+        }).then(async (c) => {
+          if (n.def.sorting.length > 0) {
+            const u = await o.run(async () => await c.sort(n.def.sorting, n.signal));
+            return c.dispose(), u;
+          }
+          return c;
+        }))();
         return new yl(a);
       }
       calculateParamsKey(n) {
@@ -4789,40 +4799,51 @@ class Sl {
     return await this.pFrames.getByKey(e).rustPFrame.listColumns();
   }
   async calculateTableData(e, t, r) {
-    let o = await this.concurrencyLimiter.run(async () => {
-      if (se().logPFrameRequests && this.logger.info(
-        `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Pe)}`
-      ), se().usePFrameRs && xr(t.filters))
-        return await this.pFrames.getByKey(e).rustPFrame.createTable({
-          src: de(t.src),
-          filters: Ee(t.filters)
-        }, r);
-      var a = [];
+    return se().logPFrameRequests && this.logger.info(
+      `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Pe)}`
+    ), se().usePFrameRs && xr(t.filters) ? await this.pFrames.getByKey(e).rustPFrame.createTable({
+      src: de(t.src),
+      filters: Ee(t.filters)
+    }, r).then(async (o) => {
+      if (t.sorting.length > 0) {
+        const n = await o.sort(t.sorting, r);
+        return o.dispose(), n;
+      }
+      return o;
+    }).then(async (o) => {
+      const n = o.getSpec(), i = await o.getData([...n.keys()]);
+      return o.dispose(), n.map((a, c) => ({
+        spec: a,
+        data: i[c]
+      }));
+    }) : await this.concurrencyLimiter.run(async () => {
+      var n = [];
       try {
-        const d = Be(a, this.pFrames.getByKey(e).disposableDataPFrame);
-        return await d.dataPFrame.createTable({
+        const o = Be(n, this.pFrames.getByKey(e).disposableDataPFrame);
+        return await o.dataPFrame.createTable({
           src: de(t.src),
           filters: Ee(t.filters)
         }, r);
-      } catch (c) {
-        var u = c, l = !0;
+      } catch (i) {
+        var a = i, c = !0;
       } finally {
-        xe(a, u, l);
+        xe(n, a, c);
       }
-    });
-    if (t.sorting.length > 0) {
-      const a = await this.concurrencyLimiter.run(
-        async () => await o.sort(t.sorting, r)
+    }).then(async (o) => {
+      if (t.sorting.length > 0) {
+        const n = await this.concurrencyLimiter.run(async () => await o.sort(t.sorting, r));
+        return o.dispose(), n;
+      }
+      return o;
+    }).then(async (o) => {
+      const n = o.getSpec(), i = await this.concurrencyLimiter.run(
+        async () => await o.getData([...n.keys()])
       );
-      o.dispose(), o = a;
-    }
-    const n = o.getSpec(), i = await this.concurrencyLimiter.run(
-      async () => await o.getData([...n.keys()])
-    );
-    return o.dispose(), n.map((a, c) => ({
-      spec: a,
-      data: i[c]
-    }));
+      return o.dispose(), n.map((a, c) => ({
+        spec: a,
+        data: i[c]
+      }));
+    });
   }
   async getUniqueValues(e, t, r) {
     return await this.concurrencyLimiter.run(async () => {
@@ -5017,7 +5038,7 @@ class Ps {
   async projectIdToResourceId(e) {
     return await this.pl.withReadTx("Project id to resource id", async (t) => {
       const r = (await t.getField(x(this.projectListResourceId, e))).value;
-      if (Xe(r)) throw new Error("Unexpected project list structure.");
+      if (qe(r)) throw new Error("Unexpected project list structure.");
       return r;
     });
   }
@@ -5070,7 +5091,7 @@ class Ps {
       const D = x(g.clientRoot, xo);
       g.createField(D, "Dynamic");
       const T = await g.getField(D);
-      if (Xe(T.value)) {
+      if (qe(T.value)) {
         const j = g.createEphemeral(Zr);
         return g.lock(j), g.setField(D, j), await g.commit(), await j.globalId;
       } else
@@ -5191,7 +5212,7 @@ async function iu(s, e = {}) {
     blockRegistryUiChecks: [],
     blockGARegistryUiChecks: [],
     autoUpdateCdnChecks: []
-  }, n = qs(s, { defaultRequestTimeout: t.pingTimeoutMs });
+  }, n = Xs(s, { defaultRequestTimeout: t.pingTimeoutMs });
   o.plPings = await ve(t.pingCheckDurationMs, t.maxPingsPerSecond, async () => {
     const u = await new Yt(n).ping();
     return JSON.stringify(u).slice(0, t.bodyLimit) + "...";
@@ -5333,7 +5354,7 @@ export {
   rs as FrontendFromUrlResourceType,
   Ps as MiddleLayer,
   xt as Project,
-  Xo as TengoTemplateGet,
+  qo as TengoTemplateGet,
   Yo as TengoTemplateGetRegistry,
   Zo as TengoTemplateGetTemplate,
   Qo as TengoTemplateGetTemplateURI,
@@ -5346,7 +5367,7 @@ export {
   Po as V2RegistryProvider,
   iu as checkNetwork,
   es as createRenderTemplate,
-  Xr as getDevV1PacketMtime,
+  qr as getDevV1PacketMtime,
   Tt as getDevV2PacketMtime,
   Rl as initDriverKit,
   Dt as loadTemplate,