@milaboratories/pl-middle-layer 1.21.5 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/block_registry/watcher.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +70 -75
- package/dist/index.mjs.map +1 -1
- package/package.json +6 -6
- package/src/block_registry/watcher.ts +9 -15
package/dist/index.mjs
CHANGED
|
@@ -3,7 +3,7 @@ var ls = (s, e, t) => e in s ? cs(s, e, { enumerable: !0, configurable: !0, writ
|
|
|
3
3
|
var S = (s, e, t) => ls(s, typeof e != "symbol" ? e + "" : e, t);
|
|
4
4
|
import { mapValueInVOE as br, executePSpecPredicate as us, mapPObjectData as ge, mapPTableDef as Cr, JsRenderInternal as ds, extractConfig as Er, isConfigLambda as Rr, DefaultNavigationState as ps, extractAllColumns as hs } from "@platforma-sdk/model";
|
|
5
5
|
export * from "@platforma-sdk/model";
|
|
6
|
-
import { AnyChannel as
|
|
6
|
+
import { AnyChannel as we, StableChannel as ne, blockPackIdToString as Lt, blockPackIdEquals as Nt } from "@milaboratories/pl-model-middle-layer";
|
|
7
7
|
export * from "@milaboratories/pl-model-middle-layer";
|
|
8
8
|
import { request as ie, RetryAgent as fs } from "undici";
|
|
9
9
|
import { RegistryV1 as ce, tryLoadPackDescription as st, BlockPackMetaEmbedAbsoluteBytes as gs, RegistryV2Reader as ms, folderReaderByUrl as vs, loadPackDescription as Dt } from "@platforma-sdk/block-tools";
|
|
@@ -133,8 +133,8 @@ class $l {
|
|
|
133
133
|
registryId: e.id,
|
|
134
134
|
id: m,
|
|
135
135
|
latestByChannel: {
|
|
136
|
-
[
|
|
137
|
-
[
|
|
136
|
+
[we]: h,
|
|
137
|
+
[ne]: h
|
|
138
138
|
},
|
|
139
139
|
allVersions: l.allVersions.map((f) => ({ version: f, channels: [] }))
|
|
140
140
|
});
|
|
@@ -142,14 +142,14 @@ class $l {
|
|
|
142
142
|
return t;
|
|
143
143
|
case "remote-v2":
|
|
144
144
|
return (await this.v2Provider.getRegistry(r.url).listBlockPacks()).map(
|
|
145
|
-
(l) => l.latestByChannel[
|
|
145
|
+
(l) => l.latestByChannel[ne] ? {
|
|
146
146
|
...l,
|
|
147
147
|
registryId: e.id
|
|
148
148
|
} : {
|
|
149
149
|
...l,
|
|
150
150
|
latestByChannel: {
|
|
151
151
|
...l.latestByChannel,
|
|
152
|
-
[
|
|
152
|
+
[ne]: ((a) => a.spec.type === "from-registry-v2" ? { ...a, spec: { ...a.spec, channel: ne } } : a)(l.latestByChannel[we])
|
|
153
153
|
},
|
|
154
154
|
registryId: e.id
|
|
155
155
|
}
|
|
@@ -185,8 +185,8 @@ class $l {
|
|
|
185
185
|
registryId: e.id,
|
|
186
186
|
id: m,
|
|
187
187
|
latestByChannel: {
|
|
188
|
-
[
|
|
189
|
-
[
|
|
188
|
+
[we]: h,
|
|
189
|
+
[ne]: h
|
|
190
190
|
},
|
|
191
191
|
allVersions: []
|
|
192
192
|
});
|
|
@@ -210,8 +210,8 @@ class $l {
|
|
|
210
210
|
registryId: e.id,
|
|
211
211
|
id: d.id,
|
|
212
212
|
latestByChannel: {
|
|
213
|
-
[
|
|
214
|
-
[
|
|
213
|
+
[we]: h,
|
|
214
|
+
[ne]: h
|
|
215
215
|
},
|
|
216
216
|
allVersions: []
|
|
217
217
|
});
|
|
@@ -584,7 +584,7 @@ function _o(s, e) {
|
|
|
584
584
|
const t = { upstreams: /* @__PURE__ */ new Set(), missingReferences: !1 };
|
|
585
585
|
return ut(t, s, e), t;
|
|
586
586
|
}
|
|
587
|
-
function
|
|
587
|
+
function te(s) {
|
|
588
588
|
return {
|
|
589
589
|
*[Symbol.iterator]() {
|
|
590
590
|
for (const e of s.groups) for (const t of e.blocks) yield t;
|
|
@@ -624,7 +624,7 @@ class Gr {
|
|
|
624
624
|
function dt(s) {
|
|
625
625
|
const e = /* @__PURE__ */ new Map();
|
|
626
626
|
let t;
|
|
627
|
-
for (const { id: r } of
|
|
627
|
+
for (const { id: r } of te(s)) {
|
|
628
628
|
const o = {
|
|
629
629
|
id: r,
|
|
630
630
|
missingReferences: !1
|
|
@@ -635,7 +635,7 @@ function dt(s) {
|
|
|
635
635
|
}
|
|
636
636
|
function Ne(s, e) {
|
|
637
637
|
const t = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set();
|
|
638
|
-
for (const { id: o } of
|
|
638
|
+
for (const { id: o } of te(s)) {
|
|
639
639
|
const n = e(o);
|
|
640
640
|
if (n === void 0) continue;
|
|
641
641
|
const i = _o(n, r), l = {
|
|
@@ -813,7 +813,7 @@ class xe {
|
|
|
813
813
|
return x(this.blockInfos.get(e));
|
|
814
814
|
}
|
|
815
815
|
getBlock(e) {
|
|
816
|
-
for (const t of
|
|
816
|
+
for (const t of te(this.struct)) if (t.id === e) return t;
|
|
817
817
|
throw new Error("block not found");
|
|
818
818
|
}
|
|
819
819
|
setBlockFieldObj(e, t, r) {
|
|
@@ -1042,7 +1042,7 @@ class xe {
|
|
|
1042
1042
|
throw new Error("Can't render blocks not including all upstreams.");
|
|
1043
1043
|
}
|
|
1044
1044
|
const n = /* @__PURE__ */ new Set();
|
|
1045
|
-
for (const i of
|
|
1045
|
+
for (const i of te(this.structure)) {
|
|
1046
1046
|
if (!r.has(i.id)) continue;
|
|
1047
1047
|
let l = this.getBlockInfo(i.id).requireProductionRendering || this.blocksInLimbo.has(i.id);
|
|
1048
1048
|
if (!l) {
|
|
@@ -1174,16 +1174,16 @@ class xe {
|
|
|
1174
1174
|
fields: {}
|
|
1175
1175
|
}, k.set(y.blockId, g)), g.fields[y.fieldName] = De(p.value) ? { modCount: 0 } : { modCount: 0, ref: p.value };
|
|
1176
1176
|
}
|
|
1177
|
-
const
|
|
1177
|
+
const se = await Jr(), ue = lt(se.hash), T = d.fields.find(
|
|
1178
1178
|
(p) => p.name === ue
|
|
1179
1179
|
);
|
|
1180
1180
|
let z;
|
|
1181
|
-
T !== void 0 ? z = ot(T.value) : (z = F.wrapInHolder(e, bt(e,
|
|
1182
|
-
D(t, lt(
|
|
1181
|
+
T !== void 0 ? z = ot(T.value) : (z = F.wrapInHolder(e, bt(e, se.spec)), e.createField(
|
|
1182
|
+
D(t, lt(se.hash)),
|
|
1183
1183
|
"Dynamic",
|
|
1184
1184
|
z
|
|
1185
1185
|
));
|
|
1186
|
-
const
|
|
1186
|
+
const oe = { stagingRefreshTimestamp: A }, K = new Set(B), G = /* @__PURE__ */ new Map();
|
|
1187
1187
|
for (const p of _) {
|
|
1188
1188
|
const y = po(p.key);
|
|
1189
1189
|
y !== void 0 && G.set(y, p.value);
|
|
@@ -1204,7 +1204,7 @@ class xe {
|
|
|
1204
1204
|
const X = /* @__PURE__ */ new Map();
|
|
1205
1205
|
k.forEach(({ id: p, fields: y }) => X.set(p, new Ht(p, y)));
|
|
1206
1206
|
const de = /* @__PURE__ */ new Set();
|
|
1207
|
-
for (const p of
|
|
1207
|
+
for (const p of te(I)) {
|
|
1208
1208
|
if (!X.has(p.id))
|
|
1209
1209
|
throw new Error(`Inconsistent project structure: no inputs for ${p.id}`);
|
|
1210
1210
|
de.add(p.id);
|
|
@@ -1222,7 +1222,7 @@ class xe {
|
|
|
1222
1222
|
h,
|
|
1223
1223
|
f,
|
|
1224
1224
|
I,
|
|
1225
|
-
|
|
1225
|
+
oe,
|
|
1226
1226
|
K,
|
|
1227
1227
|
X,
|
|
1228
1228
|
G,
|
|
@@ -1605,7 +1605,7 @@ class Ct {
|
|
|
1605
1605
|
}
|
|
1606
1606
|
static create(e, t, r) {
|
|
1607
1607
|
const o = e.accessor(t).node(), n = x(o.getKeyValueAsJson(le)), l = dt(n).traverseIds("upstream", r), a = /* @__PURE__ */ new Map();
|
|
1608
|
-
for (const c of
|
|
1608
|
+
for (const c of te(n)) {
|
|
1609
1609
|
if (!l.has(c.id)) continue;
|
|
1610
1610
|
const u = zt(
|
|
1611
1611
|
o.traverse({
|
|
@@ -1650,7 +1650,7 @@ function Et(s, e) {
|
|
|
1650
1650
|
uiState: (o) => o.accessor(s).node().getKeyValueAsString(it(e)),
|
|
1651
1651
|
blockMeta: (o) => {
|
|
1652
1652
|
const n = o.accessor(s).node(), i = x(n.getKeyValueAsJson(le)), l = /* @__PURE__ */ new Map();
|
|
1653
|
-
for (const a of
|
|
1653
|
+
for (const a of te(i)) l.set(a.id, a);
|
|
1654
1654
|
return l;
|
|
1655
1655
|
}
|
|
1656
1656
|
};
|
|
@@ -2775,17 +2775,17 @@ function be(s, e, t, r, o, n = {}) {
|
|
|
2775
2775
|
function Gn(s, e, t) {
|
|
2776
2776
|
return V.make(
|
|
2777
2777
|
(r) => {
|
|
2778
|
-
var f, I, A, B, _, k,
|
|
2778
|
+
var f, I, A, B, _, k, se, ue;
|
|
2779
2779
|
const o = r.accessor(s).node(), n = x(o.getKeyValueAsJson(St)), i = x(o.getKeyValueAsJson(Re)), l = x(o.getKeyValueAsJson(ke)), a = x(o.getKeyValueAsJson(le)), c = x(
|
|
2780
2780
|
o.getKeyValueAsJson(Be)
|
|
2781
2781
|
), u = /* @__PURE__ */ new Map();
|
|
2782
|
-
for (const { id: T } of
|
|
2782
|
+
for (const { id: T } of te(a)) {
|
|
2783
2783
|
const z = o.traverse({
|
|
2784
2784
|
field: U(T, "currentArgs"),
|
|
2785
2785
|
assertFieldType: "Dynamic",
|
|
2786
2786
|
errorIfFieldNotSet: !0
|
|
2787
2787
|
});
|
|
2788
|
-
let
|
|
2788
|
+
let oe;
|
|
2789
2789
|
const K = o.traverse({
|
|
2790
2790
|
field: U(T, "prodArgs"),
|
|
2791
2791
|
assertFieldType: "Dynamic",
|
|
@@ -2801,28 +2801,28 @@ function Gn(s, e, t) {
|
|
|
2801
2801
|
assertFieldType: "Dynamic",
|
|
2802
2802
|
errorIfFieldNotFound: !0
|
|
2803
2803
|
});
|
|
2804
|
-
|
|
2804
|
+
oe = {
|
|
2805
2805
|
arguments: K.getDataAsJson(),
|
|
2806
2806
|
stale: z.id !== K.id,
|
|
2807
2807
|
outputError: G.error !== void 0 || j.error !== void 0 || ((f = G.value) == null ? void 0 : f.getError()) !== void 0 || ((I = j.value) == null ? void 0 : I.getError()) !== void 0,
|
|
2808
2808
|
outputsError: ((A = G.error) == null ? void 0 : A.getDataAsString()) ?? ((_ = (B = G.value) == null ? void 0 : B.getError()) == null ? void 0 : _.getDataAsString()),
|
|
2809
|
-
exportsError: ((k = j.error) == null ? void 0 : k.getDataAsString()) ?? ((ue = (
|
|
2809
|
+
exportsError: ((k = j.error) == null ? void 0 : k.getDataAsString()) ?? ((ue = (se = j.value) == null ? void 0 : se.getError()) == null ? void 0 : ue.getDataAsString()),
|
|
2810
2810
|
finished: (G.value !== void 0 && G.value.getIsReadyOrError() || G.error !== void 0 && G.error.getIsReadyOrError()) && (j.value !== void 0 && j.value.getIsReadyOrError() || j.error !== void 0 && j.error.getIsReadyOrError())
|
|
2811
2811
|
};
|
|
2812
2812
|
}
|
|
2813
|
-
u.set(T, { currentArguments: z.getDataAsJson(), prod:
|
|
2813
|
+
u.set(T, { currentArguments: z.getDataAsJson(), prod: oe });
|
|
2814
2814
|
}
|
|
2815
|
-
const d = Ne(a, (T) => u.get(T).currentArguments), m = new Set(c.blocksInLimbo), h = [...
|
|
2815
|
+
const d = Ne(a, (T) => u.get(T).currentArguments), m = new Set(c.blocksInLimbo), h = [...te(a)].map(({ id: T, label: z, renderingMode: oe }) => {
|
|
2816
2816
|
var b, w, C, P, E;
|
|
2817
2817
|
const K = x(u.get(T)), G = x(d.nodes.get(T));
|
|
2818
2818
|
let j = "NotCalculated";
|
|
2819
2819
|
K.prod !== void 0 && (m.has(T) ? j = "Limbo" : j = K.prod.finished ? "Done" : "Running");
|
|
2820
2820
|
const X = Ge(o, T), { sections: de, title: v, inputsValid: p, sdkVersion: y } = Se(X, ({ bpId: O, cfg: L, info: N }) => {
|
|
2821
|
-
const
|
|
2821
|
+
const re = Et(s, T);
|
|
2822
2822
|
return {
|
|
2823
2823
|
sections: be(
|
|
2824
2824
|
t,
|
|
2825
|
-
|
|
2825
|
+
re,
|
|
2826
2826
|
L.sections,
|
|
2827
2827
|
L.code,
|
|
2828
2828
|
O
|
|
@@ -2831,7 +2831,7 @@ function Gn(s, e, t) {
|
|
|
2831
2831
|
L.title,
|
|
2832
2832
|
(as) => be(
|
|
2833
2833
|
t,
|
|
2834
|
-
|
|
2834
|
+
re,
|
|
2835
2835
|
as,
|
|
2836
2836
|
L.code,
|
|
2837
2837
|
O
|
|
@@ -2839,7 +2839,7 @@ function Gn(s, e, t) {
|
|
|
2839
2839
|
),
|
|
2840
2840
|
inputsValid: be(
|
|
2841
2841
|
t,
|
|
2842
|
-
|
|
2842
|
+
re,
|
|
2843
2843
|
L.inputsValid,
|
|
2844
2844
|
L.code,
|
|
2845
2845
|
O
|
|
@@ -2854,7 +2854,7 @@ function Gn(s, e, t) {
|
|
|
2854
2854
|
id: T,
|
|
2855
2855
|
label: v ?? z,
|
|
2856
2856
|
title: v ?? z,
|
|
2857
|
-
renderingMode:
|
|
2857
|
+
renderingMode: oe,
|
|
2858
2858
|
stale: ((b = K.prod) == null ? void 0 : b.stale) !== !1 || j === "Limbo",
|
|
2859
2859
|
missingReference: G.missingReferences,
|
|
2860
2860
|
upstreams: [...d.traverseIdsExcludingRoots("upstream", T)],
|
|
@@ -2977,7 +2977,7 @@ function Kn(s, e, t) {
|
|
|
2977
2977
|
function Hn(s, e) {
|
|
2978
2978
|
return V.make((t) => {
|
|
2979
2979
|
const r = t.accessor(s).node(), o = x(r.getKeyValueAsJson(le)), n = [];
|
|
2980
|
-
for (const { id: i, renderingMode: l } of
|
|
2980
|
+
for (const { id: i, renderingMode: l } of te(o)) {
|
|
2981
2981
|
const a = Ge(r, i);
|
|
2982
2982
|
if (a === void 0) continue;
|
|
2983
2983
|
const c = Object.entries(a.cfg.outputs).map(([, d]) => d).filter((d) => Un(d)).map((d) => d);
|
|
@@ -3553,13 +3553,13 @@ const tr = M, ui = (s, e, t = !1) => {
|
|
|
3553
3553
|
throw r;
|
|
3554
3554
|
}
|
|
3555
3555
|
};
|
|
3556
|
-
var
|
|
3557
|
-
const di =
|
|
3556
|
+
var me = ui;
|
|
3557
|
+
const di = me, pi = (s, e) => {
|
|
3558
3558
|
const t = di(s, e);
|
|
3559
3559
|
return t ? t.version : null;
|
|
3560
3560
|
};
|
|
3561
3561
|
var hi = pi;
|
|
3562
|
-
const fi =
|
|
3562
|
+
const fi = me, gi = (s, e) => {
|
|
3563
3563
|
const t = fi(s.trim().replace(/^[=v]+/, ""), e);
|
|
3564
3564
|
return t ? t.version : null;
|
|
3565
3565
|
};
|
|
@@ -3576,7 +3576,7 @@ const rr = M, vi = (s, e, t, r, o) => {
|
|
|
3576
3576
|
}
|
|
3577
3577
|
};
|
|
3578
3578
|
var yi = vi;
|
|
3579
|
-
const sr =
|
|
3579
|
+
const sr = me, wi = (s, e) => {
|
|
3580
3580
|
const t = sr(s, null, !0), r = sr(e, null, !0), o = t.compare(r);
|
|
3581
3581
|
if (o === 0)
|
|
3582
3582
|
return null;
|
|
@@ -3593,7 +3593,7 @@ const Ri = M, ki = (s, e) => new Ri(s, e).minor;
|
|
|
3593
3593
|
var Pi = ki;
|
|
3594
3594
|
const $i = M, Oi = (s, e) => new $i(s, e).patch;
|
|
3595
3595
|
var Ii = Oi;
|
|
3596
|
-
const Ai =
|
|
3596
|
+
const Ai = me, Fi = (s, e) => {
|
|
3597
3597
|
const t = Ai(s, e);
|
|
3598
3598
|
return t && t.prerelease.length ? t.prerelease : null;
|
|
3599
3599
|
};
|
|
@@ -3650,7 +3650,7 @@ const na = rs, ia = ss, aa = _e, ca = Ot, la = $t, ua = It, da = (s, e, t, r) =>
|
|
|
3650
3650
|
}
|
|
3651
3651
|
};
|
|
3652
3652
|
var os = da;
|
|
3653
|
-
const pa = M, ha =
|
|
3653
|
+
const pa = M, ha = me, { safeRe: Te, t: Le } = $e, fa = (s, e) => {
|
|
3654
3654
|
if (s instanceof pa)
|
|
3655
3655
|
return s;
|
|
3656
3656
|
if (typeof s == "number" && (s = String(s)), typeof s != "string")
|
|
@@ -3793,7 +3793,7 @@ function Z() {
|
|
|
3793
3793
|
for (; y && g.length; )
|
|
3794
3794
|
y = g.every((w) => b.intersects(w, p)), b = g.pop();
|
|
3795
3795
|
return y;
|
|
3796
|
-
}, _ = (v, p) => (i("comp", v, p), v = T(v, p), i("caret", v), v =
|
|
3796
|
+
}, _ = (v, p) => (i("comp", v, p), v = T(v, p), i("caret", v), v = se(v, p), i("tildes", v), v = oe(v, p), i("xrange", v), v = G(v, p), i("stars", v), v), k = (v) => !v || v.toLowerCase() === "x" || v === "*", se = (v, p) => v.trim().split(/\s+/).map((y) => ue(y, p)).join(" "), ue = (v, p) => {
|
|
3797
3797
|
const y = p.loose ? a[c.TILDELOOSE] : a[c.TILDE];
|
|
3798
3798
|
return v.replace(y, (g, b, w, C, P) => {
|
|
3799
3799
|
i("tilde", v, g, b, w, C, P);
|
|
@@ -3808,15 +3808,15 @@ function Z() {
|
|
|
3808
3808
|
let O;
|
|
3809
3809
|
return k(w) ? O = "" : k(C) ? O = `>=${w}.0.0${g} <${+w + 1}.0.0-0` : k(P) ? w === "0" ? O = `>=${w}.${C}.0${g} <${w}.${+C + 1}.0-0` : O = `>=${w}.${C}.0${g} <${+w + 1}.0.0-0` : E ? (i("replaceCaret pr", E), w === "0" ? C === "0" ? O = `>=${w}.${C}.${P}-${E} <${w}.${C}.${+P + 1}-0` : O = `>=${w}.${C}.${P}-${E} <${w}.${+C + 1}.0-0` : O = `>=${w}.${C}.${P}-${E} <${+w + 1}.0.0-0`) : (i("no pr"), w === "0" ? C === "0" ? O = `>=${w}.${C}.${P}${g} <${w}.${C}.${+P + 1}-0` : O = `>=${w}.${C}.${P}${g} <${w}.${+C + 1}.0-0` : O = `>=${w}.${C}.${P} <${+w + 1}.0.0-0`), i("caret return", O), O;
|
|
3810
3810
|
});
|
|
3811
|
-
},
|
|
3811
|
+
}, oe = (v, p) => (i("replaceXRanges", v, p), v.split(/\s+/).map((y) => K(y, p)).join(" ")), K = (v, p) => {
|
|
3812
3812
|
v = v.trim();
|
|
3813
3813
|
const y = p.loose ? a[c.XRANGELOOSE] : a[c.XRANGE];
|
|
3814
3814
|
return v.replace(y, (g, b, w, C, P, E) => {
|
|
3815
3815
|
i("xRange", v, g, b, w, C, P, E);
|
|
3816
|
-
const O = k(w), L = O || k(C), N = L || k(P),
|
|
3817
|
-
return b === "=" &&
|
|
3816
|
+
const O = k(w), L = O || k(C), N = L || k(P), re = N;
|
|
3817
|
+
return b === "=" && re && (b = ""), E = p.includePrerelease ? "-0" : "", O ? b === ">" || b === "<" ? g = "<0.0.0-0" : g = "*" : b && re ? (L && (C = 0), P = 0, b === ">" ? (b = ">=", L ? (w = +w + 1, C = 0, P = 0) : (C = +C + 1, P = 0)) : b === "<=" && (b = "<", L ? w = +w + 1 : C = +C + 1), b === "<" && (E = "-0"), g = `${b + w}.${C}.${P}${E}`) : L ? g = `>=${w}.0.0${E} <${+w + 1}.0.0-0` : N && (g = `>=${w}.${C}.0${E} <${w}.${+C + 1}.0-0`), i("xRange return", g), g;
|
|
3818
3818
|
});
|
|
3819
|
-
}, G = (v, p) => (i("replaceStars", v, p), v.trim().replace(a[c.STAR], "")), j = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(a[p.includePrerelease ? c.GTE0PRE : c.GTE0], "")), X = (v) => (p, y, g, b, w, C, P, E, O, L, N,
|
|
3819
|
+
}, G = (v, p) => (i("replaceStars", v, p), v.trim().replace(a[c.STAR], "")), j = (v, p) => (i("replaceGTE0", v, p), v.trim().replace(a[p.includePrerelease ? c.GTE0PRE : c.GTE0], "")), X = (v) => (p, y, g, b, w, C, 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" : ""}` : C ? 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()), de = (v, p, y) => {
|
|
3820
3820
|
for (let g = 0; g < v.length; g++)
|
|
3821
3821
|
if (!v[g].test(p))
|
|
3822
3822
|
return !1;
|
|
@@ -4000,7 +4000,7 @@ var ec = (s, e, t) => {
|
|
|
4000
4000
|
const a = l.join(" || "), c = typeof e.raw == "string" ? e.raw : String(e);
|
|
4001
4001
|
return a.length < c.length ? a : e;
|
|
4002
4002
|
};
|
|
4003
|
-
const pr = Z(), Ft = Ke(), { ANY: et } = Ft,
|
|
4003
|
+
const pr = Z(), Ft = Ke(), { ANY: et } = Ft, ve = He, Tt = Y, tc = (s, e, t = {}) => {
|
|
4004
4004
|
if (s === e)
|
|
4005
4005
|
return !0;
|
|
4006
4006
|
s = new pr(s, t), e = new pr(e, t);
|
|
@@ -4042,10 +4042,10 @@ const pr = Z(), Ft = Ke(), { ANY: et } = Ft, ye = He, Tt = Y, tc = (s, e, t = {}
|
|
|
4042
4042
|
return null;
|
|
4043
4043
|
}
|
|
4044
4044
|
for (const h of r) {
|
|
4045
|
-
if (o && !
|
|
4045
|
+
if (o && !ve(h, String(o), t) || n && !ve(h, String(n), t))
|
|
4046
4046
|
return null;
|
|
4047
4047
|
for (const f of e)
|
|
4048
|
-
if (!
|
|
4048
|
+
if (!ve(h, String(f), t))
|
|
4049
4049
|
return !1;
|
|
4050
4050
|
return !0;
|
|
4051
4051
|
}
|
|
@@ -4056,14 +4056,14 @@ const pr = Z(), Ft = Ke(), { ANY: et } = Ft, ye = He, Tt = Y, tc = (s, e, t = {}
|
|
|
4056
4056
|
if (m && h.semver.prerelease && h.semver.prerelease.length && h.semver.major === m.major && h.semver.minor === m.minor && h.semver.patch === m.patch && (m = !1), h.operator === ">" || h.operator === ">=") {
|
|
4057
4057
|
if (l = fr(o, h, t), l === h && l !== o)
|
|
4058
4058
|
return !1;
|
|
4059
|
-
} else if (o.operator === ">=" && !
|
|
4059
|
+
} else if (o.operator === ">=" && !ve(o.semver, String(h), t))
|
|
4060
4060
|
return !1;
|
|
4061
4061
|
}
|
|
4062
4062
|
if (n) {
|
|
4063
4063
|
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 === "<=") {
|
|
4064
4064
|
if (a = gr(n, h, t), a === h && a !== n)
|
|
4065
4065
|
return !1;
|
|
4066
|
-
} else if (n.operator === "<=" && !
|
|
4066
|
+
} else if (n.operator === "<=" && !ve(n.semver, String(h), t))
|
|
4067
4067
|
return !1;
|
|
4068
4068
|
}
|
|
4069
4069
|
if (!h.operator && (n || o) && i !== 0)
|
|
@@ -4082,7 +4082,7 @@ const pr = Z(), Ft = Ke(), { ANY: et } = Ft, ye = He, Tt = Y, tc = (s, e, t = {}
|
|
|
4082
4082
|
return r < 0 ? s : r > 0 || e.operator === "<" && s.operator === "<=" ? e : s;
|
|
4083
4083
|
};
|
|
4084
4084
|
var oc = tc;
|
|
4085
|
-
const tt = $e, mr = Je, nc = M, vr = ts, ic =
|
|
4085
|
+
const tt = $e, mr = Je, nc = M, vr = ts, ic = me, ac = hi, cc = mi, lc = yi, uc = Si, dc = Ei, pc = Pi, hc = Ii, fc = Ti, gc = Y, mc = Bi, vc = Vi, yc = Pt, wc = Mi, Sc = Hi, bc = _e, Cc = $t, Ec = rs, Rc = ss, kc = Ot, Pc = It, $c = os, Oc = ga, Ic = Ke(), Ac = Z(), Fc = He, Tc = Ca, Lc = Pa, Nc = Aa, Dc = La, Bc = Ba, xc = At, jc = Ha, Vc = Xa, Uc = Ya, Gc = ec, Jc = oc;
|
|
4086
4086
|
var Mc = {
|
|
4087
4087
|
parse: ic,
|
|
4088
4088
|
valid: ac,
|
|
@@ -4178,32 +4178,27 @@ class Wc extends Ts {
|
|
|
4178
4178
|
const r = this.registryProvider.getRegistry(t.registryUrl);
|
|
4179
4179
|
let o;
|
|
4180
4180
|
if (t.channel === void 0) {
|
|
4181
|
-
const n = await r.getLatestOverview(t.id,
|
|
4181
|
+
const n = await r.getLatestOverview(t.id, ne);
|
|
4182
4182
|
if (n) o = n.spec;
|
|
4183
4183
|
else {
|
|
4184
|
-
const i = await r.getLatestOverview(t.id,
|
|
4184
|
+
const i = await r.getLatestOverview(t.id, we);
|
|
4185
4185
|
if (i === void 0) {
|
|
4186
|
-
this.logger.error(`No any channel record for ${Lt(t.id)}`);
|
|
4186
|
+
this.logger.error(`No "any" channel record for ${Lt(t.id)}`);
|
|
4187
4187
|
return;
|
|
4188
4188
|
}
|
|
4189
|
-
o = { ...i.spec, channel:
|
|
4189
|
+
o = { ...i.spec, channel: ne };
|
|
4190
4190
|
}
|
|
4191
4191
|
} else {
|
|
4192
|
-
const n = await r.getLatestOverview(
|
|
4193
|
-
|
|
4194
|
-
|
|
4195
|
-
|
|
4196
|
-
|
|
4197
|
-
|
|
4198
|
-
|
|
4199
|
-
if (i === void 0) {
|
|
4200
|
-
this.logger.error(`No any channel record for ${Lt(t.id)}`);
|
|
4201
|
-
return;
|
|
4202
|
-
}
|
|
4203
|
-
o = { ...i.spec, channel: te };
|
|
4192
|
+
const n = this.preferredUpdateChannel ?? t.channel, i = await r.getLatestOverview(t.id, n);
|
|
4193
|
+
if (i) o = i.spec;
|
|
4194
|
+
else {
|
|
4195
|
+
this.logger.error(
|
|
4196
|
+
`Can't find update for ${Lt(t.id)} in channel "${n}"`
|
|
4197
|
+
);
|
|
4198
|
+
return;
|
|
4204
4199
|
}
|
|
4205
4200
|
}
|
|
4206
|
-
if (
|
|
4201
|
+
if (o.type !== "from-registry-v2") throw new Error(`Unexpected spec type ${o}.`);
|
|
4207
4202
|
return _c.compare(o.id.version, t.id.version) <= 0 ? void 0 : ((async () => {
|
|
4208
4203
|
try {
|
|
4209
4204
|
await r.getComponents(o.id);
|
|
@@ -4759,23 +4754,23 @@ async function Fl(s, e = {}) {
|
|
|
4759
4754
|
return o.blockRegistryOverviewChecks = await he(
|
|
4760
4755
|
t.blockRegistryDurationMs,
|
|
4761
4756
|
t.maxRegistryChecksPerSecond,
|
|
4762
|
-
async () => await
|
|
4757
|
+
async () => await ye(new URL(t.blockOverviewPath, t.blockRegistryUrl), t, l)
|
|
4763
4758
|
), o.blockGARegistryOverviewChecks = await he(
|
|
4764
4759
|
t.blockRegistryDurationMs,
|
|
4765
4760
|
t.maxRegistryChecksPerSecond,
|
|
4766
|
-
async () => await
|
|
4761
|
+
async () => await ye(new URL(t.blockOverviewPath, t.blockGARegistryUrl), t, l)
|
|
4767
4762
|
), o.blockRegistryUiChecks = await he(
|
|
4768
4763
|
t.blockRegistryDurationMs,
|
|
4769
4764
|
t.maxRegistryChecksPerSecond,
|
|
4770
|
-
async () => await
|
|
4765
|
+
async () => await ye(new URL(t.blockUiPath, t.blockRegistryUrl), t, l)
|
|
4771
4766
|
), o.blockGARegistryUiChecks = await he(
|
|
4772
4767
|
t.blockRegistryDurationMs,
|
|
4773
4768
|
t.maxRegistryChecksPerSecond,
|
|
4774
|
-
async () => await
|
|
4769
|
+
async () => await ye(new URL(t.blockUiPath, t.blockGARegistryUrl), t, l)
|
|
4775
4770
|
), o.autoUpdateCdnChecks = await he(
|
|
4776
4771
|
t.autoUpdateCdnDurationMs,
|
|
4777
4772
|
t.maxAutoUpdateCdnChecksPerSecond,
|
|
4778
|
-
async () => await
|
|
4773
|
+
async () => await ye(t.autoUpdateCdnUrl, t, l)
|
|
4779
4774
|
), tl(o, s, t, r);
|
|
4780
4775
|
}
|
|
4781
4776
|
async function he(s, e, t) {
|
|
@@ -4798,7 +4793,7 @@ async function he(s, e, t) {
|
|
|
4798
4793
|
}
|
|
4799
4794
|
return o;
|
|
4800
4795
|
}
|
|
4801
|
-
async function
|
|
4796
|
+
async function ye(s, e, t) {
|
|
4802
4797
|
const { body: r, statusCode: o } = await ie(s, {
|
|
4803
4798
|
dispatcher: t,
|
|
4804
4799
|
headersTimeout: e.httpTimeoutMs,
|