@milaboratories/pl-middle-layer 1.30.4 → 1.30.6

package/dist/index.mjs

@@ -26,25 +26,25 @@ var Be = (s, e, t) => {
   };
   return n();
 };
-import { mapValueInVOE as Vr, executePSpecPredicate as Fs, mapPObjectData as ue, mapPTableDef as mt, JsRenderInternal as Is, extractConfig as Ur, isConfigLambda as Jr, DefaultNavigationState as As, extractAllColumns as Ts } from "@platforma-sdk/model";
+import { mapValueInVOE as Vr, executePSpecPredicate as Fs, mapPObjectData as le, mapPTableDef as mt, JsRenderInternal as Is, extractConfig as Ur, isConfigLambda as Jr, DefaultNavigationState as As, extractAllColumns as Ts } from "@platforma-sdk/model";
 export * from "@platforma-sdk/model";
-import { AnyChannel as Se, StableChannel as ce, InitialBlockSettings as zt, blockPackIdToString as Ls } from "@milaboratories/pl-model-middle-layer";
+import { AnyChannel as Pe, StableChannel as ke, InitialBlockSettings as zt, blockPackIdToString as Ls } from "@milaboratories/pl-model-middle-layer";
 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 Xt } from "@platforma-sdk/block-tools";
+import { RegistryV1 as de, 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 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";
+import { resourceTypesEqual as ce, 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 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";
+import { parseTemplate as eo, PlTemplateV1 as ae, PlTemplateOverrideV1 as at, PlTemplateLibV1 as je, PlTemplateSoftwareV1 as Se } from "@milaboratories/pl-model-backend";
 import { LRUCache as Hr } from "lru-cache";
 import Wr from "denque";
 import { Templates as to } from "@platforma-sdk/workflow-tengo";
@@ -65,7 +65,7 @@ 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"], Xr = ["frontend", "dist"], tr = "block-model/dist/config.json", wo = "block-ui/package.json", bo = [
+const yo = [de.PlPackageYamlConfigFile], So = [de.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,
@@ -133,7 +133,7 @@ class Ql {
     switch (r.type) {
       case "remote-v1": {
         const o = this.http !== void 0 ? { dispatcher: this.http } : {}, i = await (await Ft(
-          `${r.url}/${pe.GlobalOverviewPath}`,
+          `${r.url}/${de.GlobalOverviewPath}`,
           o
         )).body.json();
         for (const a of i) {
@@ -161,8 +161,8 @@ class Ql {
             registryId: e.id,
             id: f,
             latestByChannel: {
-              [Se]: h,
-              [ce]: h
+              [Pe]: h,
+              [ke]: h
             },
             allVersions: a.allVersions.map((C) => ({ version: C, channels: [] }))
           });
@@ -170,27 +170,15 @@ class Ql {
         return t;
       }
       case "remote-v2":
-        return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map(
-          (o) => o.latestByChannel[ce] ? {
-            ...o,
-            registryId: e.id
-          } : {
-            ...o,
-            latestByChannel: {
-              ...o.latestByChannel,
-              [ce]: ((n) => n.spec.type === "from-registry-v2" ? { ...n, spec: { ...n.spec, channel: ce } } : n)(o.latestByChannel[Se])
-            },
-            registryId: e.id
-          }
-        );
+        return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map((o) => ({ ...o, registryId: e.id }));
       case "local-dev":
         for (const o of await Y.promises.readdir(r.path, { withFileTypes: !0 })) {
           if (!o.isDirectory()) continue;
           const n = _.join(r.path, o.name), i = await Co(
-            _.join(n, pe.PlPackageYamlConfigFile)
+            _.join(n, de.PlPackageYamlConfigFile)
           );
           if (i !== void 0) {
-            const a = pe.PlPackageConfigData.parse(js.parse(i)), c = await qr(n), u = {
+            const a = de.PlPackageConfigData.parse(js.parse(i)), c = await qr(n), u = {
               organization: a.organization,
               name: a.package,
               version: "DEV"
@@ -214,8 +202,8 @@ class Ql {
               registryId: e.id,
               id: u,
               latestByChannel: {
-                [Se]: l,
-                [ce]: l
+                [Pe]: l,
+                [ke]: l
               },
               allVersions: []
             });
@@ -239,8 +227,8 @@ class Ql {
                 registryId: e.id,
                 id: c.id,
                 latestByChannel: {
-                  [Se]: l,
-                  [ce]: l
+                  [Pe]: l,
+                  [ke]: l
                 },
                 allVersions: []
               });
@@ -297,7 +285,7 @@ const Zl = {
   blocksInLimbo: []
 }, $o = {
   label: "New Project"
-}, Fo = { name: "UserProject", version: "2" }, Yr = "SchemaVersion", Qr = "1", Lt = "ProjectCreated", Ae = "ProjectLastModified", Te = "ProjectMeta", he = "ProjectStructure", Ye = "BlockRenderingState", Io = "BlockFrontendState/", Ao = /^BlockFrontendState\/(?<blockid>.*)$/;
+}, Fo = { name: "UserProject", version: "2" }, Yr = "SchemaVersion", Qr = "1", Lt = "ProjectCreated", Ae = "ProjectLastModified", Te = "ProjectMeta", pe = "ProjectStructure", Ye = "BlockRenderingState", Io = "BlockFrontendState/", Ao = /^BlockFrontendState\/(?<blockid>.*)$/;
 function wt(s) {
   return `${Io}${s}`;
 }
@@ -325,7 +313,7 @@ function Bo(s) {
   const { blockId: t, fieldName: r } = e.groups;
   return { blockId: t, fieldName: r };
 }
-const xo = "projects", Zr = { name: "Projects", version: "1" }, jo = (s) => le(s.type, Zr) ? s.fields : [];
+const xo = "projects", Zr = { name: "Projects", version: "1" }, jo = (s) => ce(s.type, Zr) ? s.fields : [];
 async function Vo(s, e, t, r) {
   const o = await Kr.init(
     s,
@@ -406,11 +394,11 @@ const nr = {
   }
 }, Ve = {
   hash(s, e) {
-    e.update(be.type.name).update(be.type.version).update(s.name).update(s.version).update(s.src);
+    e.update(Se.type.name).update(Se.type.version).update(s.name).update(s.version).update(s.src);
   },
   render(s, e, t) {
-    const r = be.fromV2Data(s), o = e.createStruct(be.type, r.data);
-    return e.setKValue(o, be.metaNameKey, JSON.stringify(r.name)), e.lock(o), o;
+    const r = Se.fromV2Data(s), o = e.createStruct(Se.type, r.data);
+    return e.setKValue(o, Se.metaNameKey, JSON.stringify(r.name)), e.lock(o), o;
   }
 }, ts = {
   hash(s, e) {
@@ -560,7 +548,7 @@ class nn {
         return JSON.parse(r);
       }
       case "from-registry-v1": {
-        const t = `${ir(e.registryUrl)}${pe.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, r = await this.remoteContentCache.forceFetch(`${t}/config.json`);
+        const t = `${ir(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, r = await this.remoteContentCache.forceFetch(`${t}/config.json`);
         return Ue(r);
       }
       case "from-registry-v2": {
@@ -618,7 +606,7 @@ class nn {
         };
       }
       case "from-registry-v1": {
-        const t = `${ir(e.registryUrl)}${pe.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, r = `${t}/template.plj.gz`, o = await this.remoteContentCache.forceFetch(r), n = new Uint8Array(o), i = await this.remoteContentCache.forceFetch(`${t}/config.json`), a = Ue(i);
+        const t = `${ir(e.registryUrl)}${de.packageContentPrefix({ organization: e.id.organization, package: e.id.name, version: e.id.version })}`, r = `${t}/template.plj.gz`, o = await this.remoteContentCache.forceFetch(r), n = new Uint8Array(o), i = await this.remoteContentCache.forceFetch(`${t}/config.json`), a = Ue(i);
         return {
           type: "explicit",
           template: {
@@ -1263,7 +1251,7 @@ class Qe {
   }
   save() {
     if (this.wasModified) {
-      this.lastModifiedChanged && this.tx.setKValue(this.rid, Ae, JSON.stringify(this.lastModified)), this.structureChanged && this.tx.setKValue(this.rid, he, JSON.stringify(this.struct)), this.renderingStateChanged && this.tx.setKValue(
+      this.lastModifiedChanged && this.tx.setKValue(this.rid, Ae, JSON.stringify(this.lastModified)), this.structureChanged && this.tx.setKValue(this.rid, pe, JSON.stringify(this.struct)), this.renderingStateChanged && this.tx.setKValue(
         this.rid,
         Ye,
         JSON.stringify({
@@ -1279,7 +1267,7 @@ class Qe {
     }
   }
   static async load(e, t, r) {
-    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Yr), i = e.getKValueJson(t, Ae), a = e.getKValueJson(t, Te), c = e.getKValueJson(t, he), u = e.getKValueJson(t, Ye), l = e.listKeyValuesString(t), [
+    const o = e.getResourceData(t, !0), n = e.getKValueJson(t, Yr), i = e.getKValueJson(t, Ae), a = e.getKValueJson(t, Te), c = e.getKValueJson(t, pe), u = e.getKValueJson(t, Ye), l = e.listKeyValuesString(t), [
       d,
       f,
       h,
@@ -1310,8 +1298,8 @@ class Qe {
         fields: {}
       }, $.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
+    const G = await as(), he = Ct(G.hash), L = d.fields.find(
+      (p) => p.name === he
     );
     let X;
     L !== void 0 ? X = yt(L.value) : (X = A.wrapInHolder(e, Dt(e, G.spec)), e.createField(
@@ -1339,14 +1327,14 @@ class Qe {
     }
     const q = /* @__PURE__ */ new Map();
     $.forEach(({ id: p, fields: m }) => q.set(p, new lr(p, m)));
-    const ge = /* @__PURE__ */ new Set();
+    const fe = /* @__PURE__ */ new Set();
     for (const p of oe(g)) {
       if (!q.has(p.id))
         throw new Error(`Inconsistent project structure: no inputs for ${p.id}`);
-      ge.add(p.id);
+      fe.add(p.id);
     }
     q.forEach((p) => {
-      if (!ge.has(p.id))
+      if (!fe.has(p.id))
         throw new Error(`Inconsistent project structure: no structure entry for ${p.id}`);
       p.check();
     });
@@ -1371,7 +1359,7 @@ async function hn(s, e = $o) {
   const t = s.createEphemeral(Fo);
   s.lock(t);
   const r = String(Date.now());
-  s.setKValue(t, Yr, JSON.stringify(Qr)), s.setKValue(t, Lt, r), s.setKValue(t, Ae, r), s.setKValue(t, Te, JSON.stringify(e)), s.setKValue(t, he, JSON.stringify(ko)), s.setKValue(t, Ye, JSON.stringify(Oo));
+  s.setKValue(t, Yr, JSON.stringify(Qr)), s.setKValue(t, Lt, r), s.setKValue(t, Ae, r), s.setKValue(t, Te, JSON.stringify(e)), s.setKValue(t, pe, JSON.stringify(ko)), s.setKValue(t, Ye, JSON.stringify(Oo));
   const o = await as();
   return s.createField(
     x(t, Ct(o.hash)),
@@ -1443,14 +1431,14 @@ function bn(s) {
   const e = s.getDataAsJson();
   if (e === void 0)
     throw new Error("unexpected data info structure, no resource data");
-  if (le(s.resourceType, wn)) {
+  if (ce(s.resourceType, wn)) {
     const t = e;
     return {
       type: "Json",
       keyLength: t.keyLength,
       data: t.data
     };
-  } else if (le(s.resourceType, mn)) {
+  } else if (ce(s.resourceType, mn)) {
     const t = e, r = Object.fromEntries(
       s.listInputFields().map((o) => [o, s.traverse({ field: o, errorIfFieldNotSet: !0 }).resourceInfo])
     );
@@ -1459,7 +1447,7 @@ function bn(s) {
       partitionKeyLength: t.partitionKeyLength,
       parts: r
     };
-  } else if (le(s.resourceType, vn)) {
+  } else if (ce(s.resourceType, vn)) {
     const t = e, r = {};
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
@@ -1477,7 +1465,7 @@ function bn(s) {
       partitionKeyLength: t.superPartitionKeyLength + t.partitionKeyLength,
       parts: r
     };
-  } else if (le(s.resourceType, yn)) {
+  } else if (ce(s.resourceType, yn)) {
     const t = e, r = {};
     for (const o of s.listInputFields())
       if (o.endsWith(".index")) {
@@ -1498,7 +1486,7 @@ function bn(s) {
       partitionKeyLength: t.partitionKeyLength,
       parts: r
     };
-  } else if (le(s.resourceType, Sn)) {
+  } else if (ce(s.resourceType, Sn)) {
     const t = e, r = {};
     for (const o of s.listInputFields()) {
       const n = s.traverse({ field: o, errorIfFieldNotSet: !0 }), i = n.listInputFields();
@@ -1754,7 +1742,7 @@ class Nt {
     return t;
   }
   static create(e, t, r) {
-    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(he)), a = Pt(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
+    const o = e.accessor(t).node(), n = B(o.getKeyValueAsJson(pe)), a = Pt(n).traverseIds("upstream", r), c = /* @__PURE__ */ new Map();
     for (const u of oe(n)) {
       if (!a.has(u.id)) continue;
       const l = pr(
@@ -1806,7 +1794,7 @@ function Bt(s, e) {
     },
     uiState: (n) => n.accessor(s).node().getKeyValueAsString(wt(e)),
     blockMeta: (n) => {
-      const i = n.accessor(s).node(), a = B(i.getKeyValueAsJson(he)), c = /* @__PURE__ */ new Map();
+      const i = n.accessor(s).node(), a = B(i.getKeyValueAsJson(pe)), c = /* @__PURE__ */ new Map();
       for (const u of oe(a)) c.set(u.id, u);
       return c;
     }
@@ -2569,7 +2557,7 @@ class Ze {
     if (!n.getIsReadyOrError()) return;
     const i = Pn(n, t, r, o), a = {};
     for (const [c, u] of Object.entries(i))
-      a[c] = ue(u, (l) => this.wrapAccessor(l));
+      a[c] = le(u, (l) => this.wrapAccessor(l));
     return a;
   }
   //
@@ -2702,7 +2690,7 @@ class Ze {
       isComplete: e.isComplete,
       entries: e.entries.map((t) => ({
         ref: t.ref,
-        obj: ue(t.obj, (r) => this.wrapAccessor(r))
+        obj: le(t.obj, (r) => this.wrapAccessor(r))
       }))
     };
   }
@@ -2728,7 +2716,7 @@ class Ze {
     return this.resultPool.getSpecByRef(e, t);
   }
   getDataFromResultPoolByRef(e, t) {
-    return ue(
+    return le(
       this.resultPool.getDataByRef(e, t),
       (r) => this.wrapAccessor(r)
     );
@@ -2742,7 +2730,7 @@ class Ze {
         "can't instantiate PFrames from this context (most porbably called from the future mapper)"
       );
     return this.env.driverKit.pFrameDriver.createPFrame(
-      e.map((t) => ue(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)),
+      e.map((t) => le(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)),
       this.computableCtx
     );
   }
@@ -2754,7 +2742,7 @@ class Ze {
     return this.env.driverKit.pFrameDriver.createPTable(
       mt(
         e,
-        (t) => ue(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
+        (t) => le(t, (r) => typeof r == "string" ? this.getAccessor(r) : r)
       ),
       this.computableCtx
     );
@@ -2988,8 +2976,8 @@ function $e(s, e, t, r, o, n = {}) {
 function li(s, e, t) {
   return J.make(
     (r) => {
-      var C, g, D, T, j, $, G, fe;
-      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(Lt)), i = B(o.getKeyValueAsJson(Ae)), a = B(o.getKeyValueAsJson(Te)), c = B(o.getKeyValueAsJson(he)), u = B(
+      var C, g, D, T, j, $, G, he;
+      const o = r.accessor(s).node(), n = B(o.getKeyValueAsJson(Lt)), i = B(o.getKeyValueAsJson(Ae)), a = B(o.getKeyValueAsJson(Te)), c = B(o.getKeyValueAsJson(pe)), u = B(
         o.getKeyValueAsJson(Ye)
       ), l = /* @__PURE__ */ new Map();
       for (const { id: L } of oe(c)) {
@@ -3019,7 +3007,7 @@ function li(s, e, t) {
             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()),
+            exportsError: (($ = V.error) == null ? void 0 : $.getDataAsString()) ?? ((he = (G = V.value) == null ? void 0 : G.getError()) == null ? void 0 : he.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())
           };
         }
@@ -3030,7 +3018,7 @@ function li(s, e, t) {
         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 q = tt(o, L), { sections: ge, title: v, inputsValid: p, sdkVersion: m } = Oe(q, ({ bpId: N, cfg: F }) => {
+        const q = tt(o, L), { sections: fe, title: v, inputsValid: p, sdkVersion: m } = Oe(q, ({ bpId: N, cfg: F }) => {
           const ne = Bt(s, L);
           return {
             sections: $e(
@@ -3081,7 +3069,7 @@ function li(s, e, t) {
           outputsError: (O = W.prod) == null ? void 0 : O.outputsError,
           exportsError: (E = W.prod) == null ? void 0 : E.exportsError,
           settings: y,
-          sections: ge,
+          sections: fe,
           inputsValid: p,
           updateInfo: {},
           currentBlockPack: (I = q == null ? void 0 : q.info) == null ? void 0 : I.source,
@@ -3122,11 +3110,11 @@ function li(s, e, t) {
 }
 function ui(s, e) {
   const t = s.node();
-  if (le(t.resourceType, rs)) {
+  if (ce(t.resourceType, rs)) {
     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 (le(t.resourceType, ss)) {
+  } else if (ce(t.resourceType, ss)) {
     const r = t.getDataAsJson();
     if (r === void 0) throw new Error("No resource data.");
     return e.signer.verify(
@@ -3202,7 +3190,7 @@ function hi(s, e, t) {
 }
 function fi(s, e) {
   return J.make((t) => {
-    const r = t.accessor(s).node(), o = B(r.getKeyValueAsJson(he)), n = [];
+    const r = t.accessor(s).node(), o = B(r.getKeyValueAsJson(pe)), n = [];
     for (const { id: i } of oe(o)) {
       const a = tt(r, i);
       if (a === void 0) continue;
@@ -3642,7 +3630,7 @@ var ws = {
   compareIdentifiers: Ss,
   rcompareIdentifiers: Fi
 };
-const _e = st, { MAX_LENGTH: mr, MAX_SAFE_INTEGER: Ke } = rt, { safeRe: vr, safeSrc: yr, t: He } = Ne, Ii = jt, { compareIdentifiers: me } = ws;
+const _e = st, { MAX_LENGTH: mr, MAX_SAFE_INTEGER: Ke } = rt, { safeRe: vr, safeSrc: yr, t: He } = Ne, Ii = jt, { compareIdentifiers: ge } = ws;
 let Ai = class re {
   constructor(e, t) {
     if (t = Ii(t), e instanceof re) {
@@ -3689,7 +3677,7 @@ let Ai = class re {
     return e.version === this.version ? 0 : this.compareMain(e) || this.comparePre(e);
   }
   compareMain(e) {
-    return e instanceof re || (e = new re(e, this.options)), me(this.major, e.major) || me(this.minor, e.minor) || me(this.patch, e.patch);
+    return e instanceof re || (e = new re(e, this.options)), ge(this.major, e.major) || ge(this.minor, e.minor) || ge(this.patch, e.patch);
   }
   comparePre(e) {
     if (e instanceof re || (e = new re(e, this.options)), this.prerelease.length && !e.prerelease.length)
@@ -3709,7 +3697,7 @@ let Ai = class re {
         return -1;
       if (r === o)
         continue;
-      return me(r, o);
+      return ge(r, o);
     } while (++t);
   }
   compareBuild(e) {
@@ -3725,7 +3713,7 @@ let Ai = class re {
         return -1;
       if (r === o)
         continue;
-      return me(r, o);
+      return ge(r, o);
     } while (++t);
   }
   // preminor will bump the version up to the next minor release, and immediately
@@ -3783,7 +3771,7 @@ let Ai = class re {
         }
         if (t) {
           let n = [t, o];
-          r === !1 && (n = [t]), me(this.prerelease[0], t) === 0 ? isNaN(this.prerelease[1]) && (this.prerelease = n) : this.prerelease = n;
+          r === !1 && (n = [t]), ge(this.prerelease[0], t) === 0 ? isNaN(this.prerelease[1]) && (this.prerelease = n) : this.prerelease = n;
         }
         break;
       }
@@ -3805,13 +3793,13 @@ const Sr = H, Ti = (s, e, t = !1) => {
     throw r;
   }
 };
-var we = Ti;
-const Li = we, Di = (s, e) => {
+var ye = Ti;
+const Li = ye, Di = (s, e) => {
   const t = Li(s, e);
   return t ? t.version : null;
 };
 var Ni = Di;
-const Bi = we, xi = (s, e) => {
+const Bi = ye, xi = (s, e) => {
   const t = Bi(s.trim().replace(/^[=v]+/, ""), e);
   return t ? t.version : null;
 };
@@ -3828,7 +3816,7 @@ const wr = H, Vi = (s, e, t, r, o) => {
   }
 };
 var Ui = Vi;
-const br = we, Ji = (s, e) => {
+const br = ye, Ji = (s, e) => {
   const t = br(s, null, !0), r = br(e, null, !0), o = t.compare(r);
   if (o === 0)
     return null;
@@ -3849,7 +3837,7 @@ const Hi = H, Wi = (s, e) => new Hi(s, e).minor;
 var zi = Wi;
 const Xi = H, qi = (s, e) => new Xi(s, e).patch;
 var Yi = qi;
-const Qi = we, Zi = (s, e) => {
+const Qi = ye, Zi = (s, e) => {
   const t = Qi(s, e);
   return t && t.prerelease.length ? t.prerelease : null;
 };
@@ -3906,7 +3894,7 @@ const Oa = bs, $a = Rs, Fa = ot, Ia = Jt, Aa = Ut, Ta = Gt, La = (s, e, t, r) =>
   }
 };
 var Cs = La;
-const Da = H, Na = we, { safeRe: We, t: ze } = Ne, Ba = (s, e) => {
+const Da = H, Na = ye, { safeRe: We, t: ze } = Ne, Ba = (s, e) => {
   if (s instanceof Da)
     return s;
   if (typeof s == "number" && (s = String(s)), typeof s != "string")
@@ -4030,7 +4018,7 @@ function te() {
           return !1;
         }
       for (let m = 0; m < this.set.length; m++)
-        if (ge(this.set[m], p, this.options))
+        if (fe(this.set[m], p, this.options))
           return !0;
       return !1;
     }
@@ -4049,7 +4037,7 @@ function te() {
     for (; m && y.length; )
       m = y.every((S) => b.intersects(S, p)), b = y.pop();
     return m;
-  }, j = (v, p) => (i("comp", v, p), v = L(v, p), i("caret", v), v = G(v, p), i("tildes", v), v = ie(v, p), i("xrange", v), v = M(v, p), i("stars", v), v), $ = (v) => !v || v.toLowerCase() === "x" || v === "*", G = (v, p) => v.trim().split(/\s+/).map((m) => fe(m, p)).join(" "), fe = (v, p) => {
+  }, j = (v, p) => (i("comp", v, p), v = L(v, p), i("caret", v), v = G(v, p), i("tildes", v), v = ie(v, p), i("xrange", v), v = M(v, p), i("stars", v), v), $ = (v) => !v || v.toLowerCase() === "x" || v === "*", G = (v, p) => v.trim().split(/\s+/).map((m) => he(m, p)).join(" "), he = (v, p) => {
     const m = p.loose ? c[u.TILDELOOSE] : c[u.TILDE];
     return v.replace(m, (y, b, S, R, O) => {
       i("tilde", v, y, b, S, R, O);
@@ -4072,7 +4060,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], "")), 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) => {
+  }, 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()), fe = (v, p, m) => {
     for (let y = 0; y < v.length; y++)
       if (!v[y].test(p))
         return !1;
@@ -4256,7 +4244,7 @@ var Rc = (s, e, t) => {
   const c = a.join(" || "), u = typeof e.raw == "string" ? e.raw : String(e);
   return c.length < u.length ? c : e;
 };
-const Ir = te(), _t = nt(), { ANY: ft } = _t, Re = it, Kt = ee, Cc = (s, e, t = {}) => {
+const Ir = te(), _t = nt(), { ANY: ft } = _t, we = it, Kt = ee, Cc = (s, e, t = {}) => {
   if (s === e)
     return !0;
   s = new Ir(s, t), e = new Ir(e, t);
@@ -4298,10 +4286,10 @@ const Ir = te(), _t = nt(), { ANY: ft } = _t, Re = it, Kt = ee, Cc = (s, e, t =
       return null;
   }
   for (const h of r) {
-    if (o && !Re(h, String(o), t) || n && !Re(h, String(n), t))
+    if (o && !we(h, String(o), t) || n && !we(h, String(n), t))
       return null;
     for (const C of e)
-      if (!Re(h, String(C), t))
+      if (!we(h, String(C), t))
         return !1;
     return !0;
   }
@@ -4312,14 +4300,14 @@ const Ir = te(), _t = nt(), { ANY: ft } = _t, Re = it, Kt = ee, Cc = (s, e, t =
       if (f && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === f.major && h.semver.minor === f.minor && h.semver.patch === f.patch && (f = !1), h.operator === ">" || h.operator === ">=") {
         if (a = Tr(o, h, t), a === h && a !== o)
           return !1;
-      } else if (o.operator === ">=" && !Re(o.semver, String(h), t))
+      } else if (o.operator === ">=" && !we(o.semver, String(h), t))
         return !1;
     }
     if (n) {
       if (d && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === d.major && h.semver.minor === d.minor && h.semver.patch === d.patch && (d = !1), h.operator === "<" || h.operator === "<=") {
         if (c = Lr(n, h, t), c === h && c !== n)
           return !1;
-      } else if (n.operator === "<=" && !Re(n.semver, String(h), t))
+      } else if (n.operator === "<=" && !we(n.semver, String(h), t))
         return !1;
     }
     if (!h.operator && (n || o) && i !== 0)
@@ -4338,7 +4326,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, 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;
+const gt = Ne, Dr = rt, Oc = H, Nr = ws, $c = ye, 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,
@@ -4437,13 +4425,13 @@ class gl extends Qs {
             let u = this.preferredUpdateChannel;
             if (u === void 0)
               if (n.channel === void 0)
-                if (await c.getLatestOverview(n.id, ce)) u = ce;
+                if (await c.getLatestOverview(n.id, ke)) u = ke;
                 else {
-                  if (await c.getLatestOverview(n.id, Se) === void 0)
+                  if (await c.getLatestOverview(n.id, Pe) === void 0)
                     return this.logger.error(
                       `No "any" channel record for ${Ls(n.id)}`
                     ), { suggestions: [] };
-                  u = Se;
+                  u = Pe;
                 }
               else u = n.channel;
             const l = await c.getUpdateSuggestions(n.id, u);
@@ -4524,18 +4512,18 @@ class Br {
     return (t = this.resources.get(e)) == null ? void 0 : t.resource;
   }
 }
-let Ce;
+let be;
 function se() {
-  return Ce || (Ce = {
+  return be || (be = {
     logPFrameRequests: process.env.MI_LOG_PFRAMES !== void 0,
     usePFrameRs: process.env.MI_USE_PFRAMES_RS !== void 0
-  }, process.env.MI_LOG_TREE_STAT && (Ce.logTreeStats = process.env.MI_LOG_TREE_STAT === "cumulative" ? "cumulative" : "per-request"), Ce);
+  }, process.env.MI_LOG_TREE_STAT && (be.logTreeStats = process.env.MI_LOG_TREE_STAT === "cumulative" ? "cumulative" : "per-request"), be);
 }
 function Fe(s) {
   return String(s.id);
 }
 const ml = ["Int", "Long", "Float", "Double", "String", "Bytes"];
-function Ee(s) {
+function Re(s) {
   const e = [], t = [];
   for (const r of s)
     r.type === "bySingleColumn" ? (e.push(r), t.push({
@@ -4568,7 +4556,7 @@ function xr(s) {
   };
   return s.every((t) => e(t.predicate));
 }
-const Pe = (s, e) => typeof e == "bigint" ? e.toString() : e;
+const Ce = (s, e) => typeof e == "bigint" ? e.toString() : e;
 class vl {
   constructor(e, t, r, o) {
     w(this, "rustPFrame");
@@ -4698,7 +4686,7 @@ class Sl {
       }
       createNewResource(n) {
         return se().logPFrameRequests && t.info(
-          `PFrame creation (pFrameHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Pe)}`
+          `PFrame creation (pFrameHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ce)}`
         ), new vl(this.blobDriver, this.logger, r, n);
       }
       calculateParamsKey(n) {
@@ -4711,11 +4699,11 @@ class Sl {
       createNewResource(n) {
         const i = n.pFrameHandle;
         se().logPFrameRequests && t.info(
-          `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Pe)}`
+          `PTable creation (pTableHandle = ${this.calculateParamsKey(n)}): ${JSON.stringify(n, Ce)}`
         );
         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)
+          src: ue(n.def.src),
+          filters: Re(n.def.filters)
         }, n.signal).then(async (c) => {
           if (n.def.sorting.length > 0) {
             const u = await c.sort(n.def.sorting, n.signal);
@@ -4727,8 +4715,8 @@ class Sl {
           try {
             const c = Be(u, this.pFrames.getByKey(i).disposableDataPFrame);
             return await c.dataPFrame.createTable({
-              src: de(n.def.src),
-              filters: Ee(n.def.filters)
+              src: ue(n.def.src),
+              filters: Re(n.def.filters)
             }, n.signal);
           } catch (l) {
             var d = l, f = !0;
@@ -4754,7 +4742,7 @@ class Sl {
   //
   createPFrame(e, t) {
     const r = e.filter((n) => ml.find((i) => i === n.spec.valueType)).map(
-      (n) => ue(
+      (n) => le(
         n,
         (i) => Ys(i) ? bn(i) : Rn(n.spec, i)
       )
@@ -4766,7 +4754,7 @@ class Sl {
     return se().logPFrameRequests && this.logger.info(
       `Create PTable call (pFrameHandle = ${o}; pTableHandle = ${JSON.stringify(i)}): ${JSON.stringify(
         mt(e, (a) => a.spec),
-        Pe
+        Ce
       )}`
     ), t.addOnDestroy(i.unref), i.key;
   }
@@ -4800,10 +4788,10 @@ class Sl {
   }
   async calculateTableData(e, t, r) {
     return se().logPFrameRequests && this.logger.info(
-      `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Pe)}`
+      `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Ce)}`
     ), se().usePFrameRs && xr(t.filters) ? await this.pFrames.getByKey(e).rustPFrame.createTable({
-      src: de(t.src),
-      filters: Ee(t.filters)
+      src: ue(t.src),
+      filters: Re(t.filters)
     }, r).then(async (o) => {
       if (t.sorting.length > 0) {
         const n = await o.sort(t.sorting, r);
@@ -4821,8 +4809,8 @@ class Sl {
       try {
         const o = Be(n, this.pFrames.getByKey(e).disposableDataPFrame);
         return await o.dataPFrame.createTable({
-          src: de(t.src),
-          filters: Ee(t.filters)
+          src: ue(t.src),
+          filters: Re(t.filters)
         }, r);
       } catch (i) {
         var a = i, c = !0;
@@ -4850,12 +4838,12 @@ class Sl {
       var n = [];
       try {
         se().logPFrameRequests && this.logger.info(
-          `Call getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Pe)}`
+          `Call getUniqueValues, handle = ${e}, request = ${JSON.stringify(t, Ce)}`
         );
         const o = Be(n, this.pFrames.getByKey(e).disposableDataPFrame);
         return await o.dataPFrame.getUniqueValues({
           ...t,
-          filters: Ee(t.filters)
+          filters: Re(t.filters)
         }, r);
       } catch (i) {
         var a = i, c = !0;
@@ -4880,7 +4868,7 @@ class Sl {
     );
   }
 }
-function de(s) {
+function ue(s) {
   switch (s.type) {
     case "column":
       return {
@@ -4892,13 +4880,13 @@ function de(s) {
     case "full":
       return {
         type: s.type,
-        entries: s.entries.map((e) => de(e))
+        entries: s.entries.map((e) => ue(e))
       };
     case "outer":
       return {
         type: "outer",
-        primary: de(s.primary),
-        secondary: s.secondary.map((e) => de(e))
+        primary: ue(s.primary),
+        secondary: s.secondary.map((e) => ue(e))
       };
     default:
       K(s);
@@ -4910,7 +4898,7 @@ function wl(s) {
 }
 function bl(s) {
   const e = [...s].map(
-    (r) => ue(r, (o) => {
+    (r) => le(r, (o) => {
       let n;
       const i = o.type;
       switch (i) {
@@ -5213,34 +5201,34 @@ async function iu(s, e = {}) {
     blockGARegistryUiChecks: [],
     autoUpdateCdnChecks: []
   }, n = Xs(s, { defaultRequestTimeout: t.pingTimeoutMs });
-  o.plPings = await ve(t.pingCheckDurationMs, t.maxPingsPerSecond, async () => {
+  o.plPings = await me(t.pingCheckDurationMs, t.maxPingsPerSecond, async () => {
     const u = await new Yt(n).ping();
     return JSON.stringify(u).slice(0, t.bodyLimit) + "...";
   });
   const a = new Yt(n).ll.httpDispatcher;
-  return o.blockRegistryOverviewChecks = await ve(
+  return o.blockRegistryOverviewChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, a)
-  ), o.blockGARegistryOverviewChecks = await ve(
+    async () => await Ee(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, a)
+  ), o.blockGARegistryOverviewChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, a)
-  ), o.blockRegistryUiChecks = await ve(
+    async () => await Ee(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, a)
+  ), o.blockRegistryUiChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockRegistryUrl), t, a)
-  ), o.blockGARegistryUiChecks = await ve(
+    async () => await Ee(new URL(t.blockUiPath, t.blockRegistryUrl), t, a)
+  ), o.blockGARegistryUiChecks = await me(
     t.blockRegistryDurationMs,
     t.maxRegistryChecksPerSecond,
-    async () => await ke(new URL(t.blockUiPath, t.blockGARegistryUrl), t, a)
-  ), o.autoUpdateCdnChecks = await ve(
+    async () => await Ee(new URL(t.blockUiPath, t.blockGARegistryUrl), t, a)
+  ), o.autoUpdateCdnChecks = await me(
     t.autoUpdateCdnDurationMs,
     t.maxAutoUpdateCdnChecksPerSecond,
-    async () => await ke(t.autoUpdateCdnUrl, t, a)
+    async () => await Ee(t.autoUpdateCdnUrl, t, a)
   ), El(o, s, t, r);
 }
-async function ve(s, e, t) {
+async function me(s, e, t) {
   const r = $t(), o = [];
   for (; jr(r) < s; ) {
     const n = $t();
@@ -5260,7 +5248,7 @@ async function ve(s, e, t) {
   }
   return o;
 }
-async function ke(s, e, t) {
+async function Ee(s, e, t) {
   const { body: r, statusCode: o } = await Ft(s, {
     dispatcher: t,
     headersTimeout: e.httpTimeoutMs,
@@ -5280,17 +5268,17 @@ Network report:
 pl endpoint: ${e};
 options: ${JSON.stringify(t, null, 2)}.
 
-Platforma pings: ${ye(s.plPings)}
+Platforma pings: ${ve(s.plPings)}
 
-Block registry overview responses: ${ye(s.blockRegistryOverviewChecks)}
+Block registry overview responses: ${ve(s.blockRegistryOverviewChecks)}
 
-Block ga registry overview responses: ${ye(s.blockGARegistryOverviewChecks)}
+Block ga registry overview responses: ${ve(s.blockGARegistryOverviewChecks)}
 
-Block registry ui responses: ${ye(s.blockRegistryUiChecks)}
+Block registry ui responses: ${ve(s.blockRegistryUiChecks)}
 
-Block ga registry ui responses: ${ye(s.blockGARegistryUiChecks)}
+Block ga registry ui responses: ${ve(s.blockGARegistryUiChecks)}
 
-Auto-update CDN responses: ${ye(s.autoUpdateCdnChecks)}
+Auto-update CDN responses: ${ve(s.autoUpdateCdnChecks)}
 
 Block registry overview dumps:
 ${JSON.stringify(s.blockRegistryOverviewChecks, null, 2)}
@@ -5318,7 +5306,7 @@ ${r.join(`
 `)}
 `;
 }
-function ye(s) {
+function ve(s) {
   const e = s.filter((o) => o.response.ok), { mean: t, median: r } = Pl(s);
   return `
 total: ${s.length};