@fireproof/core-cli 0.24.0-dev-multi-clerks-0 → 0.24.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/build-cmd.d.ts +4 -0
- package/build-cmd.js +26 -18
- package/build-cmd.js.map +1 -1
- package/build-cmd.test.js +2 -8
- package/build-cmd.test.js.map +1 -1
- package/cloud-token-key-cmd.js +29 -2
- package/cloud-token-key-cmd.js.map +1 -1
- package/main.js +5 -1
- package/main.js.map +1 -1
- package/package.json +20 -26
- package/retry-cmd.d.ts +14 -0
- package/retry-cmd.js +96 -0
- package/retry-cmd.js.map +1 -0
- package/version-pinner.d.ts +26 -0
- package/version-pinner.js +131 -0
- package/version-pinner.js.map +1 -0
- package/version-pinner.test.d.ts +1 -0
- package/version-pinner.test.js +233 -0
- package/version-pinner.test.js.map +1 -0
- package/vitest.config.js +2 -0
- package/vitest.config.js.map +1 -1
- package/well-known-cmd.d.ts +22 -0
- package/well-known-cmd.js +112 -0
- package/well-known-cmd.js.map +1 -0
- package/{write-env.js → write-env-cmd.js} +13 -12
- package/write-env-cmd.js.map +1 -0
- package/write-env.js.map +0 -1
- /package/{write-env.d.ts → write-env-cmd.d.ts} +0 -0
package/build-cmd.d.ts
CHANGED
|
@@ -64,6 +64,8 @@ export declare function buildCmd(sthis: SuperThis): Partial<import("cmd-ts/dist/
|
|
|
64
64
|
excludedNames: string[];
|
|
65
65
|
noCleanDst: boolean;
|
|
66
66
|
noTsconfig: boolean;
|
|
67
|
+
noPinned: boolean;
|
|
68
|
+
lockfile: string;
|
|
67
69
|
noBuild: boolean;
|
|
68
70
|
doPack: boolean;
|
|
69
71
|
packDestDir: string;
|
|
@@ -85,6 +87,8 @@ export declare function buildCmd(sthis: SuperThis): Partial<import("cmd-ts/dist/
|
|
|
85
87
|
excludedNames: string[];
|
|
86
88
|
noCleanDst: boolean;
|
|
87
89
|
noTsconfig: boolean;
|
|
90
|
+
noPinned: boolean;
|
|
91
|
+
lockfile: string;
|
|
88
92
|
noBuild: boolean;
|
|
89
93
|
doPack: boolean;
|
|
90
94
|
packDestDir: string;
|
package/build-cmd.js
CHANGED
|
@@ -5,6 +5,7 @@ import { findUp } from "find-up";
|
|
|
5
5
|
import { cd, $ } from "zx";
|
|
6
6
|
import { SemVer } from "semver";
|
|
7
7
|
import { exception2Result } from "@adviser/cement";
|
|
8
|
+
import { VersionPinner } from "./version-pinner.js";
|
|
8
9
|
const reVersionAlphaStart = /^[a-z](\d+\.\d+\.\d+.*)$/;
|
|
9
10
|
const reScopedVersion = /^[^@]+@(.*)$/;
|
|
10
11
|
const reEndVersion = /.*\/([^/]+)$/;
|
|
@@ -66,18 +67,6 @@ export class Version {
|
|
|
66
67
|
return `${this.#versionPrefix}${this.#version}`;
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
function patchDeps(dep, version) {
|
|
70
|
-
if (typeof dep !== "object" || !dep) {
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
for (const i of Object.keys(dep)) {
|
|
74
|
-
const val = dep[i];
|
|
75
|
-
if (val.startsWith("workspace:")) {
|
|
76
|
-
dep[i] = version;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
return dep;
|
|
80
|
-
}
|
|
81
70
|
export async function patchPackageJson(packageJsonPath, version, changeScope, mock = { readJSON: fs.readJson }) {
|
|
82
71
|
const originalPackageJson = await mock.readJSON(packageJsonPath);
|
|
83
72
|
const patchedPackageJson = await mock.readJSON(packageJsonPath);
|
|
@@ -93,8 +82,6 @@ export async function patchPackageJson(packageJsonPath, version, changeScope, mo
|
|
|
93
82
|
patchedPackageJson.version = version.version;
|
|
94
83
|
delete patchedPackageJson.scripts["pack"];
|
|
95
84
|
delete patchedPackageJson.scripts["publish"];
|
|
96
|
-
patchedPackageJson.dependencies = patchDeps(patchedPackageJson.dependencies, version.prefixedVersion);
|
|
97
|
-
patchedPackageJson.devDependencies = patchDeps(patchedPackageJson.devDependencies, version.prefixedVersion);
|
|
98
85
|
return { patchedPackageJson, originalPackageJson };
|
|
99
86
|
}
|
|
100
87
|
async function updateTsconfig(srcTsConfig, dstTsConfig) {
|
|
@@ -109,7 +96,6 @@ async function updateTsconfig(srcTsConfig, dstTsConfig) {
|
|
|
109
96
|
tsconfig.include.push("**/*");
|
|
110
97
|
tsconfig.exclude = tsconfig.exclude || [];
|
|
111
98
|
tsconfig.exclude.push("node_modules", "dist", ".git", ".vscode");
|
|
112
|
-
console.log("tsconfig", tsconfig);
|
|
113
99
|
await fs.writeJSONSync(dstTsConfig, tsconfig, { spaces: 2 });
|
|
114
100
|
}
|
|
115
101
|
export function sanitizeNpmrc(srcNpmRc) {
|
|
@@ -269,6 +255,17 @@ export function buildCmd(sthis) {
|
|
|
269
255
|
short: "t",
|
|
270
256
|
description: "Do not update tsconfig.json in the destination directory.",
|
|
271
257
|
}),
|
|
258
|
+
noPinned: flag({
|
|
259
|
+
long: "no-pinned",
|
|
260
|
+
description: "Do not pin dependencies in package.json (pinning is enabled by default).",
|
|
261
|
+
}),
|
|
262
|
+
lockfile: option({
|
|
263
|
+
long: "lockfile",
|
|
264
|
+
short: "L",
|
|
265
|
+
type: string,
|
|
266
|
+
defaultValue: () => "",
|
|
267
|
+
description: "Path to the pnpm-lock.yaml file to use for pinning versions, defaults to auto-discovery.",
|
|
268
|
+
}),
|
|
272
269
|
noBuild: flag({
|
|
273
270
|
long: "noBuild",
|
|
274
271
|
short: "b",
|
|
@@ -398,7 +395,18 @@ export function buildCmd(sthis) {
|
|
|
398
395
|
}
|
|
399
396
|
$.verbose = true;
|
|
400
397
|
cd(jsrDstDir);
|
|
401
|
-
|
|
398
|
+
let packageJson = await patchPackageJson("package.json", version, args.changeScope);
|
|
399
|
+
if (!args.noPinned) {
|
|
400
|
+
console.log("Prepared package.json with pinning for", packageJson.patchedPackageJson.name, "version", packageJson.patchedPackageJson.version);
|
|
401
|
+
const lockfilePath = args.lockfile || path.join(path.dirname(top), "pnpm-lock.yaml");
|
|
402
|
+
const pinner = await VersionPinner.create({ lockfilePath });
|
|
403
|
+
packageJson = {
|
|
404
|
+
...packageJson,
|
|
405
|
+
patchedPackageJson: pinner.pinVersions(packageJson.patchedPackageJson, {
|
|
406
|
+
workspaceVersion: version.prefixedVersion,
|
|
407
|
+
}),
|
|
408
|
+
};
|
|
409
|
+
}
|
|
402
410
|
await fs.writeJSON("package.json", packageJson.patchedPackageJson, { spaces: 2 });
|
|
403
411
|
fs.copy(".", "../npm", {
|
|
404
412
|
filter: (src, _dst) => {
|
|
@@ -420,7 +428,7 @@ export function buildCmd(sthis) {
|
|
|
420
428
|
const jsrConf = await buildJsrConf(packageJson, version.prefixedVersion);
|
|
421
429
|
await fs.writeJSON("jsr.json", jsrConf, { spaces: 2 });
|
|
422
430
|
if (!isPrivate(packageJson.originalPackageJson)) {
|
|
423
|
-
const res = await $ `pnpm exec deno publish --allow-dirty ${args.doPack ? "--dry-run" : ""}
|
|
431
|
+
const res = await $ `pnpm exec deno publish --allow-dirty ${args.doPack ? "--dry-run" : ""}`.nothrow();
|
|
424
432
|
if (res.exitCode !== 0) {
|
|
425
433
|
throw new Error(`Failed to pack the package.`);
|
|
426
434
|
}
|
|
@@ -465,7 +473,7 @@ export function buildCmd(sthis) {
|
|
|
465
473
|
}
|
|
466
474
|
const registry = ["--registry", args.registry];
|
|
467
475
|
const tagsOpts = tags.map((tag) => ["--tag", tag]).flat();
|
|
468
|
-
const res = await $ `${["pnpm", "publish", "--access", "public", ...registry, "--no-git-checks", ...tagsOpts]}
|
|
476
|
+
const res = await $ `${["pnpm", "publish", "--access", "public", ...registry, "--no-git-checks", ...tagsOpts]}`.nothrow();
|
|
469
477
|
if (res.exitCode !== 0) {
|
|
470
478
|
throw new Error(`Failed to publish the package.`);
|
|
471
479
|
}
|
package/build-cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,mBAAmB,GAAG,0BAA0B,CAAC;AAEvD,MAAM,eAAe,GAAG,cAAc,CAAC;AACvC,MAAM,YAAY,GAAG,cAAc,CAAC;AAEpC,SAAS,aAAa,CAAC,OAAO,GAAG,wBAAwB,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG;IAC3E,IAAI,QAAQ,GAAG,OAAO,CAAC;IACvB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEhC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAE,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IACrG,IAAI,CAAC;QACH,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC9B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAUD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,cAAuB,EACvB,EAAE,GAAG,EAAE,IAAI,KAAoB;IAC7B,GAAG,EAAE;QACH,UAAU,EAAE,EAAE,CAAC,UAAU;QAEzB,QAAQ,EAAE,EAAE,CAAC,QAAe;KAC7B;IACD,IAAI,EAAE,OAAO,CAAC,GAA6B;CAC5C;IAED,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,cAAc,IAAI,GAAG,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;QACnE,IAAI,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAClC,OAAO,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,CAAA,4BAA4B,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpE,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAA,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,aAAa,CAAC,0BAA0B,OAAO,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,OAAO,OAAO;IAClB,QAAQ,CAAS;IACjB,cAAc,CAAS;IAEvB,YAAY,OAAe,EAAE,aAAqB;QAChD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClD,CAAC;CACF;AAED,SAAS,SAAS,CAAC,GAA2B,EAAE,OAAe;IAC7D,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,eAAuB,EACvB,OAAgB,EAChB,WAAoB,EACpB,OAEI,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;IAK7B,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,kBAAkB,CAAC,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,WAAW,GAAG,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,kBAAkB,CAAC,IAAI,GAAG,IAAI,WAAW,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACzE,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC7C,OAAO,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7C,kBAAkB,CAAC,YAAY,GAAG,SAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACtG,kBAAkB,CAAC,eAAe,GAAG,SAAS,CAAC,kBAAkB,CAAC,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAE5G,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,WAAmB,EAAE,WAAmB;IACpE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,eAAe,GAAG;QACzB,GAAG,QAAQ,CAAC,eAAe;QAC3B,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,SAAS;KAClB,CAAC;IACF,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEjE,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClC,MAAM,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;AAM/D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB;IAK5C,OAAO,QAAQ;SACZ,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,GAAG,CAAC;YACjB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,OAAO,GAAG,GAAG,CAAC;YACtB,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAChE,OAAO,GAAG,IAAI,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC;QACrB,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACjD,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,OAAwD;IAC7E,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;QACrF,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjD,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;oBACf,IAAI,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;wBAChC,OAAO,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;oBAC7C,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBACb,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,GAAG,EAAE,YAAY,EAA4B,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,IAA4B,EAAE,OAAe;IAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,OAAO,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YAC7C,OAAO,GAAG,CAAC;QACb,CAAC;QACD,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA4B,CAC7B,CAAC;AACJ,CAAC;AAoBD,SAAS,SAAS,CAAC,CAAc;IAC/B,OAAO,CACL,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,MAAM,CAAC,CAAC,CAC/H,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EAAyE,EACzE,OAAe;IAEf,IAAI,SAAS,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAc;QACzB,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI;QAChC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO;QACtC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO;QACtC,cAAc,EAAE,MAAM;QACtB,QAAQ,EAAE,CAAC,gBAAgB,CAAC;QAC5B,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,IAAI,EAAE,CAAC,aAAa,CAAC;gBACrB,OAAO,EAAE,CAAC,mBAAmB,CAAC;aAC/B;SACF;QACD,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC;QACtD,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC;QACjE,OAAO,EAAE;YACP,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC;SACzD;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAGD,MAAM,UAAU,QAAQ,CAAC,KAAgB;IACvC,MAAM,GAAG,GAAG,OAAO,CAAC;QAClB,IAAI,EAAE,qBAAqB;QAC3B,WAAW,EAAE,mBAAmB;QAChC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,cAAc,EAAE,IAAI,CAAC;gBACnB,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,4FAA4F;aAC1G,CAAC;YACF,SAAS,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,kBAAkB;gBACtC,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,0EAA0E;aACxF,CAAC;YACF,OAAO,EAAE,MAAM,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,mFAAmF;aACjG,CAAC;YACF,MAAM,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;gBACxB,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,MAAM,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ;gBAC5B,0BAA0B,EAAE,IAAI;gBAChC,IAAI,EAAE,MAAM;aACb,CAAC;YACF,aAAa,EAAE,WAAW,CAAC;gBACzB,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,kBAAkB,CAAC;gBACvF,0BAA0B,EAAE,IAAI;aACjC,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;aACX,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,2DAA2D;aACzE,CAAC;YACF,OAAO,EAAE,IAAI,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,mDAAmD;aACjE,CAAC;YACF,MAAM,EAAE,IAAI,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,WAAW,EAAE,oCAAoC;aAClD,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;aACvB,CAAC;YACF,KAAK,EAAE,MAAM,CAAC;gBACZ,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,8EAA8E;aAC5F,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;gBAChC,WAAW,EAAE,uEAAuE;aACrF,CAAC;YACF,UAAU,EAAE,MAAM,CAAC;gBACjB,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,WAAW;gBAC/B,WAAW,EAAE,wEAAwE;aACtF,CAAC;YACF,QAAQ,EAAE,MAAM,CAAC;gBACf,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,oFAAoF;aAClG,CAAC;YACF,UAAU,EAAE,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,GAAG;gBACV,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;gBACzB,WAAW,EAAE,iCAAiC;aAC/C,CAAC;YACF,WAAW,EAAE,MAAM,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,kCAAkC;aAChD,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;gBACpB,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,WAAW,EAAE,gCAAgC;aAC9C,CAAC;YACF,OAAO,EAAE,WAAW,CAAC;gBACnB,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;gBACnB,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE;gBACtB,0BAA0B,EAAE,IAAI;gBAChC,WAAW,EAAE,iEAAiE;aAC/E,CAAC;SACH;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAC5E,CAAC;YACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAE9D,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;gBAC/D,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpD,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACvD,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;gBAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,OAAO;YACT,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAC5E,CAAC;YAID,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC;YAED,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;gBAClC,MAAM,EAAE,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;oBACpC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChC,OAAO,KAAK,CAAC;oBACf,CAAC;oBAID,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAC1D,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAElC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;YACvG,CAAC;YACD,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;YACjB,EAAE,CAAC,SAAS,CAAC,CAAC;YAEd,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACtF,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAGlF,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;gBACrB,MAAM,EAAE,CAAC,GAAW,EAAE,IAAY,EAAE,EAAE;oBACpC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBAChD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,CAAC,CAAA,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;YACL,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;gBAC5D,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBACzE,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAChD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAA,wCAAwC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;oBAC5F,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;wBACvB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBACjD,CAAC;gBACH,CAAC;YACH,CAAC;YAGD,EAAE,CAAC,QAAQ,CAAC,CAAC;YACb,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;oBACxD,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACrB,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;oBACzF,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;oBACzF,MAAM,GAAG,GAAG,MAAM,CAAC,CAAA,oBAAoB,IAAI,CAAC,WAAW,UAAU,CAAC;oBAClE,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;wBACvB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBACjD,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnB,IAAI,CAAC,QAAQ,GAAG,6BAA6B,CAAC;gBAChD,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC;gBAC9E,CAAC;gBACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,KAAK,kBAAkB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;oBACvE,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;oBACxE,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAI1C,CAAC;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;wBAC9E,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnB,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBAED,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,CAAA,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,QAAQ,EAAE,iBAAiB,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;gBAC/G,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,CAAC;YAEH,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"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"}
|
package/build-cmd.test.js
CHANGED
|
@@ -30,17 +30,11 @@ const mock = {
|
|
|
30
30
|
it("getVersion emptyString", async () => {
|
|
31
31
|
expect(await getVersion("", { xenv: {} })).toContain("0.0.0-smoke");
|
|
32
32
|
});
|
|
33
|
-
it("should
|
|
34
|
-
const version = new Version("0.0.0-smoke", "^");
|
|
35
|
-
const { patchedPackageJson } = await patchPackageJson("package.json", version, undefined, mock);
|
|
36
|
-
expect(patchedPackageJson.version).toBe("0.0.0-smoke");
|
|
37
|
-
expect(patchedPackageJson.dependencies).toHaveProperty("@fireproof/vendor", "^0.0.0-smoke");
|
|
38
|
-
});
|
|
39
|
-
it("should only use prefix version in dependencies", async () => {
|
|
33
|
+
it("should set package version but leave workspace dependencies as-is", async () => {
|
|
40
34
|
const version = new Version("0.0.0-smoke", "^");
|
|
41
35
|
const { patchedPackageJson } = await patchPackageJson("package.json", version, undefined, mock);
|
|
42
36
|
expect(patchedPackageJson.version).toBe("0.0.0-smoke");
|
|
43
|
-
expect(patchedPackageJson.dependencies).toHaveProperty("@fireproof/vendor", "
|
|
37
|
+
expect(patchedPackageJson.dependencies).toHaveProperty("@fireproof/vendor", "workspace:0.0.0");
|
|
44
38
|
});
|
|
45
39
|
it("should only use prefix version in dependencies", async () => {
|
|
46
40
|
const version = new Version("0.0.0-smoke", "^");
|
package/build-cmd.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-cmd.test.js","sourceRoot":"","sources":["../jsr/build-cmd.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACjH,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,IAAI,GAAG;IACX,QAAQ,EAAE,KAAK,IAAsB,EAAE;QACrC,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;YAC/D,YAAY,EAAE,CAAC,kBAAkB,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,CAAC;YAC/F,MAAM,EAAE,kBAAkB;YAC1B,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE;gBACP,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,gBAAgB;aAC1B;YACD,YAAY,EAAE;gBACZ,mBAAmB,EAAE,iBAAiB;gBACtC,QAAQ,EAAE,SAAS;aACpB;YACD,eAAe,EAAE;gBACf,qBAAqB,EAAE,iBAAiB;gBACxC,MAAM,EAAE,QAAQ;aACjB;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;IACtC,MAAM,CAAC,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"build-cmd.test.js","sourceRoot":"","sources":["../jsr/build-cmd.test.ts"],"names":[],"mappings":"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"}
|
package/cloud-token-key-cmd.js
CHANGED
|
@@ -1,6 +1,29 @@
|
|
|
1
|
+
import { JWKPrivateSchema, JWKPublicSchema } from "@fireproof/core-types-base";
|
|
1
2
|
import * as rt from "@fireproof/core-runtime";
|
|
2
3
|
import { command, flag, option, string } from "cmd-ts";
|
|
3
4
|
import { exportJWK } from "jose/key/export";
|
|
5
|
+
import { Result, exception2Result } from "@adviser/cement";
|
|
6
|
+
import { z } from "zod/v4";
|
|
7
|
+
async function ourToJWK(env, sthis) {
|
|
8
|
+
const rCryptoKeys = await exception2Result(() => rt.sts.env2jwk(env, undefined, sthis));
|
|
9
|
+
if (rCryptoKeys.isErr()) {
|
|
10
|
+
return Result.Err(rCryptoKeys);
|
|
11
|
+
}
|
|
12
|
+
const cryptoKeys = rCryptoKeys.Ok();
|
|
13
|
+
const keys = [];
|
|
14
|
+
for (const key of cryptoKeys) {
|
|
15
|
+
const rKey = await exception2Result(() => exportJWK(key));
|
|
16
|
+
if (rKey.isErr()) {
|
|
17
|
+
return Result.Err(rKey);
|
|
18
|
+
}
|
|
19
|
+
const parsed = z.union([JWKPublicSchema, JWKPrivateSchema]).safeParse(rKey.Ok());
|
|
20
|
+
if (!parsed.success) {
|
|
21
|
+
return Result.Err(`Invalid JWK public key: ${parsed.error.message}`);
|
|
22
|
+
}
|
|
23
|
+
keys.push(parsed.data);
|
|
24
|
+
}
|
|
25
|
+
return Result.Ok({ keys });
|
|
26
|
+
}
|
|
4
27
|
export function keyCmd(sthis) {
|
|
5
28
|
return command({
|
|
6
29
|
name: "cli-key-cmds",
|
|
@@ -28,8 +51,12 @@ export function keyCmd(sthis) {
|
|
|
28
51
|
switch (true) {
|
|
29
52
|
case !!args.ourToJWK:
|
|
30
53
|
{
|
|
31
|
-
const
|
|
32
|
-
|
|
54
|
+
const r = await ourToJWK(args.ourToJWK, sthis);
|
|
55
|
+
if (r.isErr()) {
|
|
56
|
+
console.error(`Error: ${r.Err()}`);
|
|
57
|
+
process.exit(1);
|
|
58
|
+
}
|
|
59
|
+
console.log(JSON.stringify(r.Ok(), null, 2));
|
|
33
60
|
}
|
|
34
61
|
break;
|
|
35
62
|
case args.generatePair:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-token-key-cmd.js","sourceRoot":"","sources":["../jsr/cloud-token-key-cmd.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cloud-token-key-cmd.js","sourceRoot":"","sources":["../jsr/cloud-token-key-cmd.ts"],"names":[],"mappings":"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"}
|
package/main.js
CHANGED
|
@@ -4,12 +4,14 @@ import { dotenv } from "zx";
|
|
|
4
4
|
import { buildCmd } from "./build-cmd.js";
|
|
5
5
|
import { setDependenciesCmd, setScriptsCmd } from "./set-scripts-cmd.js";
|
|
6
6
|
import { handleTsc, tscCmd } from "./tsc-cmd.js";
|
|
7
|
-
import { writeEnvCmd } from "./write-env.js";
|
|
7
|
+
import { writeEnvCmd } from "./write-env-cmd.js";
|
|
8
8
|
import { keyCmd } from "./cloud-token-key-cmd.js";
|
|
9
9
|
import { preSignedUrlCmd } from "./pre-signed-url.js";
|
|
10
10
|
import { dependabotCmd } from "./dependabot-cmd.js";
|
|
11
11
|
import { testContainerCmd } from "./test-container-cmd.js";
|
|
12
12
|
import { deviceIdCmd } from "./device-id-cmd.js";
|
|
13
|
+
import { wellKnownCmd } from "./well-known-cmd.js";
|
|
14
|
+
import { retryCmd } from "./retry-cmd.js";
|
|
13
15
|
(async () => {
|
|
14
16
|
dotenv.config(process.env.FP_ENV ?? ".env");
|
|
15
17
|
const sthis = ensureSuperThis();
|
|
@@ -31,6 +33,8 @@ import { deviceIdCmd } from "./device-id-cmd.js";
|
|
|
31
33
|
dependabot: dependabotCmd(sthis),
|
|
32
34
|
testContainer: testContainerCmd(sthis),
|
|
33
35
|
deviceId: deviceIdCmd(sthis),
|
|
36
|
+
wellKnown: wellKnownCmd(sthis),
|
|
37
|
+
retry: retryCmd(sthis),
|
|
34
38
|
},
|
|
35
39
|
});
|
|
36
40
|
await run(cmd, process.argv.slice(2));
|
package/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../jsr/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../jsr/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,CAAC,KAAK,IAAI,EAAE;IACV,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAGhC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,GAAG,GAAG,WAAW,CAAC;QACtB,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE;YACJ,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC;YAClB,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,eAAe,CAAC,KAAK,CAAC;YACjC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;YAChC,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC;YAC1C,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;YAChC,aAAa,EAAE,gBAAgB,CAAC,KAAK,CAAC;YACtC,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;YAC9B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAExC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fireproof/core-cli",
|
|
3
|
-
"version": "0.24.0
|
|
3
|
+
"version": "0.24.0",
|
|
4
4
|
"description": "Live ledger for the web.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": "./run.js",
|
|
@@ -31,32 +31,26 @@
|
|
|
31
31
|
"url": "https://github.com/fireproof-storage/fireproof/issues"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@adviser/cement": "
|
|
35
|
-
"@fireproof/core-device-id": "0.24.0
|
|
36
|
-
"@fireproof/core-keybag": "0.24.0
|
|
37
|
-
"@fireproof/core-runtime": "0.24.0
|
|
38
|
-
"@fireproof/core-types-base": "0.24.0
|
|
39
|
-
"@fireproof/vendor": "0.24.0
|
|
40
|
-
"@hono/node-server": "
|
|
41
|
-
"@pnpm/lockfile-file": "
|
|
34
|
+
"@adviser/cement": "0.5.2",
|
|
35
|
+
"@fireproof/core-device-id": "0.24.0",
|
|
36
|
+
"@fireproof/core-keybag": "0.24.0",
|
|
37
|
+
"@fireproof/core-runtime": "0.24.0",
|
|
38
|
+
"@fireproof/core-types-base": "0.24.0",
|
|
39
|
+
"@fireproof/vendor": "0.24.0",
|
|
40
|
+
"@hono/node-server": "1.19.6",
|
|
41
|
+
"@pnpm/lockfile-file": "9.1.3",
|
|
42
42
|
"@typescript/native-preview": "7.0.0-dev.20251123.1",
|
|
43
|
-
"aws4fetch": "
|
|
44
|
-
"cmd-ts": "
|
|
45
|
-
"find-up": "
|
|
46
|
-
"fs-extra": "
|
|
47
|
-
"hono": "
|
|
48
|
-
"jose": "
|
|
49
|
-
"multiformats": "
|
|
50
|
-
"open": "
|
|
51
|
-
"semver": "
|
|
52
|
-
"
|
|
53
|
-
|
|
54
|
-
"devDependencies": {
|
|
55
|
-
"@fireproof/core-cli": "0.24.0-dev-multi-clerks-0",
|
|
56
|
-
"@types/fs-extra": "^11.0.4",
|
|
57
|
-
"@types/semver": "^7.7.1",
|
|
58
|
-
"tsx": "^4.20.4",
|
|
59
|
-
"vitest": "^4.0.8"
|
|
43
|
+
"aws4fetch": "1.0.20",
|
|
44
|
+
"cmd-ts": "0.14.3",
|
|
45
|
+
"find-up": "8.0.0",
|
|
46
|
+
"fs-extra": "11.3.2",
|
|
47
|
+
"hono": "4.10.6",
|
|
48
|
+
"jose": "6.1.2",
|
|
49
|
+
"multiformats": "13.4.1",
|
|
50
|
+
"open": "8.4.2",
|
|
51
|
+
"semver": "7.7.3",
|
|
52
|
+
"zod": "4.1.13",
|
|
53
|
+
"zx": "8.8.5"
|
|
60
54
|
},
|
|
61
55
|
"scripts": {
|
|
62
56
|
"build": "node ./run.js tsc",
|
package/retry-cmd.d.ts
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { SuperThis } from "@fireproof/core-types-base";
|
|
2
|
+
export declare function retryCmd(_sthis: SuperThis): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
|
+
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
|
+
retry: number;
|
|
5
|
+
timeout: number;
|
|
6
|
+
command: string[];
|
|
7
|
+
}>>;
|
|
8
|
+
} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
9
|
+
retry: number;
|
|
10
|
+
timeout: number;
|
|
11
|
+
command: string[];
|
|
12
|
+
}, Promise<void>> & {
|
|
13
|
+
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
14
|
+
} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
|
package/retry-cmd.js
ADDED
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { command, option, number, restPositionals } from "cmd-ts";
|
|
2
|
+
import { $ } from "zx";
|
|
3
|
+
import { timeouted, isSuccess, isTimeout, isAborted, isError } from "@adviser/cement";
|
|
4
|
+
export function retryCmd(_sthis) {
|
|
5
|
+
return command({
|
|
6
|
+
name: "retry",
|
|
7
|
+
description: "Execute a command with retry logic and timeout support.",
|
|
8
|
+
args: {
|
|
9
|
+
retry: option({
|
|
10
|
+
long: "retry",
|
|
11
|
+
short: "r",
|
|
12
|
+
description: "Number of retry attempts (default: 2)",
|
|
13
|
+
type: number,
|
|
14
|
+
defaultValue: () => 2,
|
|
15
|
+
}),
|
|
16
|
+
timeout: option({
|
|
17
|
+
long: "timeout",
|
|
18
|
+
short: "t",
|
|
19
|
+
description: "Timeout in seconds for each attempt (0 = no timeout)",
|
|
20
|
+
type: number,
|
|
21
|
+
defaultValue: () => 0,
|
|
22
|
+
}),
|
|
23
|
+
command: restPositionals({
|
|
24
|
+
description: "Command and arguments to execute",
|
|
25
|
+
displayName: "command",
|
|
26
|
+
}),
|
|
27
|
+
},
|
|
28
|
+
handler: async function (args) {
|
|
29
|
+
const retryCount = args.retry;
|
|
30
|
+
const timeoutSec = args.timeout;
|
|
31
|
+
if (isNaN(retryCount) || retryCount < 1) {
|
|
32
|
+
console.error("Error: --retry must be a positive number");
|
|
33
|
+
process.exit(1);
|
|
34
|
+
}
|
|
35
|
+
if (isNaN(timeoutSec) || timeoutSec < 0) {
|
|
36
|
+
console.error("Error: --timeout must be a non-negative number");
|
|
37
|
+
process.exit(1);
|
|
38
|
+
}
|
|
39
|
+
if (!args.command || args.command.length === 0) {
|
|
40
|
+
console.error("Error: No command specified");
|
|
41
|
+
process.exit(1);
|
|
42
|
+
}
|
|
43
|
+
const commandStr = args.command.join(" ");
|
|
44
|
+
const maxAttempts = retryCount;
|
|
45
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
46
|
+
const isLastAttempt = attempt === maxAttempts;
|
|
47
|
+
console.log(`[Attempt ${attempt}/${maxAttempts}] Running: ${commandStr}`);
|
|
48
|
+
const executeCommand = async () => {
|
|
49
|
+
$.verbose = true;
|
|
50
|
+
const result = await $ `${args.command}`.nothrow();
|
|
51
|
+
if (result.exitCode !== 0) {
|
|
52
|
+
throw new Error(`Command failed with exit code ${result.exitCode}`);
|
|
53
|
+
}
|
|
54
|
+
return result;
|
|
55
|
+
};
|
|
56
|
+
const result = await timeouted(executeCommand(), { timeout: timeoutSec * 1000 });
|
|
57
|
+
switch (true) {
|
|
58
|
+
case isSuccess(result): {
|
|
59
|
+
console.log(`[Attempt ${attempt}/${maxAttempts}] Command succeeded`);
|
|
60
|
+
process.exit(0);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
case isTimeout(result): {
|
|
64
|
+
console.error(`[Attempt ${attempt}/${maxAttempts}] Command timed out after ${timeoutSec}s`);
|
|
65
|
+
if (isLastAttempt) {
|
|
66
|
+
console.error(`All ${maxAttempts} attempts failed. Last failure: timeout`);
|
|
67
|
+
process.exit(124);
|
|
68
|
+
}
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
case isAborted(result): {
|
|
72
|
+
console.error(`[Attempt ${attempt}/${maxAttempts}] Command was aborted`);
|
|
73
|
+
if (isLastAttempt) {
|
|
74
|
+
console.error(`All ${maxAttempts} attempts failed. Last failure: aborted`);
|
|
75
|
+
process.exit(130);
|
|
76
|
+
}
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
case isError(result): {
|
|
80
|
+
const errorMsg = result.error instanceof Error ? result.error.message : String(result.error);
|
|
81
|
+
console.error(`[Attempt ${attempt}/${maxAttempts}] Command failed: ${errorMsg}`);
|
|
82
|
+
if (isLastAttempt) {
|
|
83
|
+
console.error(`All ${maxAttempts} attempts failed. Last failure: ${errorMsg}`);
|
|
84
|
+
process.exit(1);
|
|
85
|
+
}
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
default: {
|
|
89
|
+
throw new Error("Unhandled result state");
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
},
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=retry-cmd.js.map
|
package/retry-cmd.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry-cmd.js","sourceRoot":"","sources":["../jsr/retry-cmd.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { PackageJson } from "./build-cmd.js";
|
|
2
|
+
interface PinVersionOptions {
|
|
3
|
+
readonly includeDevDeps?: boolean;
|
|
4
|
+
readonly workspaceVersion?: string;
|
|
5
|
+
}
|
|
6
|
+
interface CreateOptions {
|
|
7
|
+
readonly lockfilePath?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface PackageDependencies {
|
|
10
|
+
name: string;
|
|
11
|
+
version: string;
|
|
12
|
+
dependencies: Record<string, string>;
|
|
13
|
+
peerDependencies?: Record<string, string>;
|
|
14
|
+
transitivePeerDependencies?: string[];
|
|
15
|
+
}
|
|
16
|
+
export declare class VersionPinner {
|
|
17
|
+
private allDeps;
|
|
18
|
+
private constructor();
|
|
19
|
+
private pinDependencies;
|
|
20
|
+
static fromLockfilePath(lockfilePath: string): Promise<VersionPinner>;
|
|
21
|
+
static create(options?: CreateOptions): Promise<VersionPinner>;
|
|
22
|
+
pinVersions(pkg: PackageJson, options?: PinVersionOptions): PackageJson;
|
|
23
|
+
}
|
|
24
|
+
export declare function getPackageDependencies(packageName: string, lockfilePath: string): Promise<PackageDependencies | null>;
|
|
25
|
+
export declare function getAllTransitiveDependencies(packageName: string, lockfilePath: string, depth?: number): Promise<Map<string, string>>;
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { readWantedLockfile } from "@pnpm/lockfile-file";
|
|
2
|
+
import { findUp } from "find-up";
|
|
3
|
+
export class VersionPinner {
|
|
4
|
+
allDeps = {};
|
|
5
|
+
constructor(allDeps) {
|
|
6
|
+
this.allDeps = allDeps;
|
|
7
|
+
}
|
|
8
|
+
pinDependencies(deps, workspaceVersion) {
|
|
9
|
+
const pinnedDeps = {};
|
|
10
|
+
if (!deps) {
|
|
11
|
+
return pinnedDeps;
|
|
12
|
+
}
|
|
13
|
+
for (const [name, version] of Object.entries(deps)) {
|
|
14
|
+
if (version.match(/^[\^~*]/) || version.match(/^[0-9]+-/)) {
|
|
15
|
+
if (this.allDeps[name]) {
|
|
16
|
+
pinnedDeps[name] = this.allDeps[name];
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
pinnedDeps[name] = version;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
else if (version.startsWith("workspace:")) {
|
|
23
|
+
pinnedDeps[name] = workspaceVersion;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
pinnedDeps[name] = version;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return pinnedDeps;
|
|
30
|
+
}
|
|
31
|
+
static async fromLockfilePath(lockfilePath) {
|
|
32
|
+
const projectDir = lockfilePath.replace(/\/[^/]+$/, "");
|
|
33
|
+
const lockfile = await readWantedLockfile(projectDir, { ignoreIncompatible: false });
|
|
34
|
+
if (!lockfile) {
|
|
35
|
+
throw new Error(`No lockfile found at ${lockfilePath}`);
|
|
36
|
+
}
|
|
37
|
+
const allDeps = {};
|
|
38
|
+
if (lockfile.packages) {
|
|
39
|
+
for (const [key, _pkgInfo] of Object.entries(lockfile.packages)) {
|
|
40
|
+
const match = key.match(/^\/?(@?[^@]+)@(.+?)(?:\(|$)/);
|
|
41
|
+
if (match) {
|
|
42
|
+
const [, name, version] = match;
|
|
43
|
+
allDeps[name] = version;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return new VersionPinner(allDeps);
|
|
48
|
+
}
|
|
49
|
+
static async create(options = {}) {
|
|
50
|
+
let lockfilePath = options.lockfilePath;
|
|
51
|
+
if (!lockfilePath) {
|
|
52
|
+
const foundPath = await findUp("pnpm-lock.yaml");
|
|
53
|
+
if (!foundPath) {
|
|
54
|
+
throw new Error("Could not find pnpm-lock.yaml in parent directories");
|
|
55
|
+
}
|
|
56
|
+
lockfilePath = foundPath;
|
|
57
|
+
}
|
|
58
|
+
return VersionPinner.fromLockfilePath(lockfilePath);
|
|
59
|
+
}
|
|
60
|
+
pinVersions(pkg, options = {}) {
|
|
61
|
+
const workspaceVersion = options.workspaceVersion ?? pkg.version;
|
|
62
|
+
const pinnedDeps = this.pinDependencies(pkg.dependencies, workspaceVersion);
|
|
63
|
+
const sortedDeps = {};
|
|
64
|
+
for (const name of Object.keys(pinnedDeps).sort()) {
|
|
65
|
+
sortedDeps[name] = pinnedDeps[name];
|
|
66
|
+
}
|
|
67
|
+
let sortedDevDeps;
|
|
68
|
+
if (options.includeDevDeps && pkg.devDependencies) {
|
|
69
|
+
const pinnedDevDeps = this.pinDependencies(pkg.devDependencies, workspaceVersion);
|
|
70
|
+
sortedDevDeps = {};
|
|
71
|
+
for (const name of Object.keys(pinnedDevDeps).sort()) {
|
|
72
|
+
sortedDevDeps[name] = pinnedDevDeps[name];
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const output = {
|
|
76
|
+
...pkg,
|
|
77
|
+
dependencies: sortedDeps,
|
|
78
|
+
};
|
|
79
|
+
if (sortedDevDeps) {
|
|
80
|
+
output.devDependencies = sortedDevDeps;
|
|
81
|
+
}
|
|
82
|
+
else if (!options.includeDevDeps) {
|
|
83
|
+
delete output.devDependencies;
|
|
84
|
+
}
|
|
85
|
+
return output;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
export async function getPackageDependencies(packageName, lockfilePath) {
|
|
89
|
+
const projectDir = lockfilePath.replace(/\/[^/]+$/, "");
|
|
90
|
+
const lockfile = await readWantedLockfile(projectDir, { ignoreIncompatible: false });
|
|
91
|
+
if (!lockfile?.packages) {
|
|
92
|
+
throw new Error(`No lockfile found at ${lockfilePath}`);
|
|
93
|
+
}
|
|
94
|
+
for (const [key, pkgInfo] of Object.entries(lockfile.packages)) {
|
|
95
|
+
const match = key.match(/^\/?(@?[^@]+)@(.+?)(?:\(|$)/);
|
|
96
|
+
if (match) {
|
|
97
|
+
const [, name, version] = match;
|
|
98
|
+
if (name === packageName) {
|
|
99
|
+
return {
|
|
100
|
+
name,
|
|
101
|
+
version,
|
|
102
|
+
dependencies: pkgInfo.dependencies || {},
|
|
103
|
+
peerDependencies: pkgInfo.peerDependencies || {},
|
|
104
|
+
transitivePeerDependencies: pkgInfo.transitivePeerDependencies || [],
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
export async function getAllTransitiveDependencies(packageName, lockfilePath, depth = Infinity) {
|
|
112
|
+
const result = new Map();
|
|
113
|
+
const visited = new Set();
|
|
114
|
+
async function traverse(pkgName, currentDepth) {
|
|
115
|
+
if (currentDepth > depth || visited.has(pkgName)) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
visited.add(pkgName);
|
|
119
|
+
const pkgInfo = await getPackageDependencies(pkgName, lockfilePath);
|
|
120
|
+
if (!pkgInfo) {
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
result.set(pkgName, pkgInfo.version);
|
|
124
|
+
for (const [depName] of Object.entries(pkgInfo.dependencies)) {
|
|
125
|
+
await traverse(depName, currentDepth + 1);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
await traverse(packageName, 0);
|
|
129
|
+
return result;
|
|
130
|
+
}
|
|
131
|
+
//# sourceMappingURL=version-pinner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version-pinner.js","sourceRoot":"","sources":["../jsr/version-pinner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
import { expect, it, describe, beforeAll } from "vitest";
|
|
2
|
+
import { VersionPinner } from "./version-pinner.js";
|
|
3
|
+
import { findUp } from "find-up";
|
|
4
|
+
import { $ } from "zx";
|
|
5
|
+
import { Lazy } from "@adviser/cement";
|
|
6
|
+
class PnpmService {
|
|
7
|
+
workingDirectory;
|
|
8
|
+
constructor(workingDirectory) {
|
|
9
|
+
this.workingDirectory = workingDirectory ?? new URL(".", import.meta.url).pathname;
|
|
10
|
+
}
|
|
11
|
+
getDependencies = Lazy(async () => {
|
|
12
|
+
const result = await $ `cd ${this.workingDirectory} && pnpm list --depth 1 --json`.quiet();
|
|
13
|
+
const json = JSON.parse(result.stdout);
|
|
14
|
+
const deps = {};
|
|
15
|
+
const packages = json[0];
|
|
16
|
+
if (packages?.dependencies) {
|
|
17
|
+
for (const [name, info] of Object.entries(packages.dependencies)) {
|
|
18
|
+
deps[name] = info.version;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (packages?.devDependencies) {
|
|
22
|
+
for (const [name, info] of Object.entries(packages.devDependencies)) {
|
|
23
|
+
deps[name] = info.version;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return deps;
|
|
27
|
+
});
|
|
28
|
+
async getInstalledVersion(packageName) {
|
|
29
|
+
const deps = await this.getDependencies();
|
|
30
|
+
const version = deps[packageName];
|
|
31
|
+
if (!version) {
|
|
32
|
+
throw new Error(`Could not find installed version for ${packageName}`);
|
|
33
|
+
}
|
|
34
|
+
return version;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
const pkgTemplate = {
|
|
38
|
+
name: "@fireproof/test-package",
|
|
39
|
+
version: "1.0.0",
|
|
40
|
+
license: "MIT",
|
|
41
|
+
scripts: {},
|
|
42
|
+
exports: {},
|
|
43
|
+
dependencies: {},
|
|
44
|
+
devDependencies: {},
|
|
45
|
+
};
|
|
46
|
+
describe("VersionPinner", () => {
|
|
47
|
+
let pinner;
|
|
48
|
+
let pnpmService;
|
|
49
|
+
let cmdTsVersion;
|
|
50
|
+
let semverVersion;
|
|
51
|
+
let multiformatsVersion;
|
|
52
|
+
beforeAll(async () => {
|
|
53
|
+
const lockfilePath = await findUp("pnpm-lock.yaml");
|
|
54
|
+
if (!lockfilePath) {
|
|
55
|
+
throw new Error("Could not find pnpm-lock.yaml");
|
|
56
|
+
}
|
|
57
|
+
pinner = await VersionPinner.create({ lockfilePath });
|
|
58
|
+
pnpmService = new PnpmService();
|
|
59
|
+
cmdTsVersion = await pnpmService.getInstalledVersion("cmd-ts");
|
|
60
|
+
semverVersion = await pnpmService.getInstalledVersion("semver");
|
|
61
|
+
multiformatsVersion = await pnpmService.getInstalledVersion("multiformats");
|
|
62
|
+
});
|
|
63
|
+
describe("pinVersions", () => {
|
|
64
|
+
it("should pin unpinned dependencies with caret (^)", () => {
|
|
65
|
+
const pkg = {
|
|
66
|
+
...pkgTemplate,
|
|
67
|
+
dependencies: {
|
|
68
|
+
"cmd-ts": `^${cmdTsVersion}`,
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
const result = pinner.pinVersions(pkg);
|
|
72
|
+
expect(result.dependencies["cmd-ts"]).toBe(cmdTsVersion);
|
|
73
|
+
});
|
|
74
|
+
it("should pin unpinned dependencies with tilde (~)", () => {
|
|
75
|
+
const pkg = {
|
|
76
|
+
...pkgTemplate,
|
|
77
|
+
dependencies: {
|
|
78
|
+
semver: `~${semverVersion}`,
|
|
79
|
+
},
|
|
80
|
+
};
|
|
81
|
+
const result = pinner.pinVersions(pkg);
|
|
82
|
+
expect(result.dependencies["semver"]).toBe(semverVersion);
|
|
83
|
+
});
|
|
84
|
+
it("should pin unpinned dependencies with asterisk (*)", () => {
|
|
85
|
+
const pkg = {
|
|
86
|
+
...pkgTemplate,
|
|
87
|
+
dependencies: {
|
|
88
|
+
multiformats: "*",
|
|
89
|
+
},
|
|
90
|
+
};
|
|
91
|
+
const result = pinner.pinVersions(pkg);
|
|
92
|
+
expect(result.dependencies["multiformats"]).toBe(multiformatsVersion);
|
|
93
|
+
});
|
|
94
|
+
it("should keep already pinned versions as-is", () => {
|
|
95
|
+
const pkg = {
|
|
96
|
+
...pkgTemplate,
|
|
97
|
+
dependencies: {
|
|
98
|
+
"cmd-ts": cmdTsVersion,
|
|
99
|
+
semver: semverVersion,
|
|
100
|
+
},
|
|
101
|
+
};
|
|
102
|
+
const result = pinner.pinVersions(pkg);
|
|
103
|
+
expect(result.dependencies["cmd-ts"]).toBe(cmdTsVersion);
|
|
104
|
+
expect(result.dependencies["semver"]).toBe(semverVersion);
|
|
105
|
+
});
|
|
106
|
+
it("should keep pinned versions as-is without looking in lockfile", () => {
|
|
107
|
+
const pkg = {
|
|
108
|
+
...pkgTemplate,
|
|
109
|
+
dependencies: {
|
|
110
|
+
"fake-package": "1.2.3",
|
|
111
|
+
"another-fake": "4.5.6",
|
|
112
|
+
},
|
|
113
|
+
};
|
|
114
|
+
const result = pinner.pinVersions(pkg);
|
|
115
|
+
expect(result.dependencies["fake-package"]).toBe("1.2.3");
|
|
116
|
+
expect(result.dependencies["another-fake"]).toBe("4.5.6");
|
|
117
|
+
});
|
|
118
|
+
it("should replace workspace: dependencies with package version", () => {
|
|
119
|
+
const pkg = {
|
|
120
|
+
...pkgTemplate,
|
|
121
|
+
dependencies: {
|
|
122
|
+
"@fireproof/vendor": "workspace:0.0.0",
|
|
123
|
+
"@fireproof/core": "workspace:*",
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
const result = pinner.pinVersions(pkg);
|
|
127
|
+
expect(result.dependencies["@fireproof/vendor"]).toBe("1.0.0");
|
|
128
|
+
expect(result.dependencies["@fireproof/core"]).toBe("1.0.0");
|
|
129
|
+
});
|
|
130
|
+
it("should not include transitive dependencies", async () => {
|
|
131
|
+
const pkg = {
|
|
132
|
+
...pkgTemplate,
|
|
133
|
+
dependencies: {
|
|
134
|
+
"cmd-ts": `^${cmdTsVersion}`,
|
|
135
|
+
},
|
|
136
|
+
};
|
|
137
|
+
const result = pinner.pinVersions(pkg);
|
|
138
|
+
expect(Object.keys(result.dependencies)).toEqual(["cmd-ts"]);
|
|
139
|
+
expect(result.dependencies["cmd-ts"]).toBe(cmdTsVersion);
|
|
140
|
+
});
|
|
141
|
+
it("should sort dependencies alphabetically", async () => {
|
|
142
|
+
const zxVersion = await pnpmService.getInstalledVersion("zx");
|
|
143
|
+
const pkg = {
|
|
144
|
+
...pkgTemplate,
|
|
145
|
+
dependencies: {
|
|
146
|
+
zx: `^${zxVersion}`,
|
|
147
|
+
semver: `^${semverVersion}`,
|
|
148
|
+
"cmd-ts": `^${cmdTsVersion}`,
|
|
149
|
+
multiformats: `^${multiformatsVersion}`,
|
|
150
|
+
},
|
|
151
|
+
};
|
|
152
|
+
const result = pinner.pinVersions(pkg);
|
|
153
|
+
const keys = Object.keys(result.dependencies);
|
|
154
|
+
expect(keys).toEqual(["cmd-ts", "multiformats", "semver", "zx"]);
|
|
155
|
+
});
|
|
156
|
+
it("should handle mixed pinned and unpinned dependencies", () => {
|
|
157
|
+
const pkg = {
|
|
158
|
+
...pkgTemplate,
|
|
159
|
+
version: "2.0.0",
|
|
160
|
+
dependencies: {
|
|
161
|
+
"cmd-ts": cmdTsVersion,
|
|
162
|
+
semver: `^${semverVersion}`,
|
|
163
|
+
"@fireproof/vendor": "workspace:0.0.0",
|
|
164
|
+
multiformats: `~${multiformatsVersion}`,
|
|
165
|
+
},
|
|
166
|
+
};
|
|
167
|
+
const result = pinner.pinVersions(pkg);
|
|
168
|
+
expect(result.dependencies["cmd-ts"]).toBe(cmdTsVersion);
|
|
169
|
+
expect(result.dependencies["semver"]).toBe(semverVersion);
|
|
170
|
+
expect(result.dependencies["@fireproof/vendor"]).toBe("2.0.0");
|
|
171
|
+
expect(result.dependencies["multiformats"]).toBe(multiformatsVersion);
|
|
172
|
+
});
|
|
173
|
+
it("should remove devDependencies by default", () => {
|
|
174
|
+
const pkg = {
|
|
175
|
+
...pkgTemplate,
|
|
176
|
+
dependencies: {
|
|
177
|
+
"cmd-ts": `^${cmdTsVersion}`,
|
|
178
|
+
},
|
|
179
|
+
devDependencies: {
|
|
180
|
+
vitest: "^4.0.8",
|
|
181
|
+
},
|
|
182
|
+
};
|
|
183
|
+
const result = pinner.pinVersions(pkg);
|
|
184
|
+
expect(result.devDependencies).toBeUndefined();
|
|
185
|
+
});
|
|
186
|
+
it("should pin devDependencies when includeDevDeps option is true", async () => {
|
|
187
|
+
const vitestVersion = await pnpmService.getInstalledVersion("vitest");
|
|
188
|
+
const pkg = {
|
|
189
|
+
...pkgTemplate,
|
|
190
|
+
dependencies: {
|
|
191
|
+
"cmd-ts": `^${cmdTsVersion}`,
|
|
192
|
+
},
|
|
193
|
+
devDependencies: {
|
|
194
|
+
vitest: `^${vitestVersion}`,
|
|
195
|
+
},
|
|
196
|
+
};
|
|
197
|
+
const result = pinner.pinVersions(pkg, { includeDevDeps: true });
|
|
198
|
+
expect(result.devDependencies).toBeDefined();
|
|
199
|
+
expect(result.devDependencies?.vitest).toBe(vitestVersion);
|
|
200
|
+
});
|
|
201
|
+
});
|
|
202
|
+
describe("VersionPinner.create", () => {
|
|
203
|
+
it("should create instance with explicit lockfile path", async () => {
|
|
204
|
+
const lockfilePath = await findUp("pnpm-lock.yaml");
|
|
205
|
+
if (!lockfilePath) {
|
|
206
|
+
throw new Error("Could not find pnpm-lock.yaml");
|
|
207
|
+
}
|
|
208
|
+
const pinner = await VersionPinner.create({ lockfilePath });
|
|
209
|
+
expect(pinner).toBeInstanceOf(VersionPinner);
|
|
210
|
+
});
|
|
211
|
+
it("should create instance with auto-discovered lockfile", async () => {
|
|
212
|
+
const pinner = await VersionPinner.create();
|
|
213
|
+
expect(pinner).toBeInstanceOf(VersionPinner);
|
|
214
|
+
});
|
|
215
|
+
it("should throw error if lockfile not found with explicit path", async () => {
|
|
216
|
+
await expect(VersionPinner.create({ lockfilePath: "/non/existent/pnpm-lock.yaml" })).rejects.toThrow("No lockfile found");
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
describe("VersionPinner.fromLockfilePath", () => {
|
|
220
|
+
it("should create instance from lockfile path", async () => {
|
|
221
|
+
const lockfilePath = await findUp("pnpm-lock.yaml");
|
|
222
|
+
if (!lockfilePath) {
|
|
223
|
+
throw new Error("Could not find pnpm-lock.yaml");
|
|
224
|
+
}
|
|
225
|
+
const pinner = await VersionPinner.fromLockfilePath(lockfilePath);
|
|
226
|
+
expect(pinner).toBeInstanceOf(VersionPinner);
|
|
227
|
+
});
|
|
228
|
+
it("should throw error if lockfile does not exist", async () => {
|
|
229
|
+
await expect(VersionPinner.fromLockfilePath("/non/existent/pnpm-lock.yaml")).rejects.toThrow("No lockfile found");
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
//# sourceMappingURL=version-pinner.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version-pinner.test.js","sourceRoot":"","sources":["../jsr/version-pinner.test.ts"],"names":[],"mappings":"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"}
|
package/vitest.config.js
CHANGED
|
@@ -2,6 +2,8 @@ import { defineConfig } from "vitest/config";
|
|
|
2
2
|
export default defineConfig({
|
|
3
3
|
test: {
|
|
4
4
|
name: "core-cli",
|
|
5
|
+
exclude: ["dist/**", "node_modules/**", "react/**", "examples/**", "gateway/indexeddb"],
|
|
6
|
+
include: ["**/*test.?(c|m)[jt]s?(x)"],
|
|
5
7
|
},
|
|
6
8
|
});
|
|
7
9
|
//# sourceMappingURL=vitest.config.js.map
|
package/vitest.config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../jsr/vitest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAe,YAAY,CAAC;IAC1B,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../jsr/vitest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAe,YAAY,CAAC;IAC1B,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,aAAa,EAAE,mBAAmB,CAAC;QACvF,OAAO,EAAE,CAAC,0BAA0B,CAAC;KACtC;CACF,CAAC,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { SuperThis } from "@fireproof/core-types-base";
|
|
2
|
+
export declare function wellKnownCmd(_sthis: SuperThis): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
|
+
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
|
+
json: boolean;
|
|
5
|
+
jsons: boolean;
|
|
6
|
+
pem: boolean;
|
|
7
|
+
env: boolean;
|
|
8
|
+
presetKey: string;
|
|
9
|
+
envPrefix: string;
|
|
10
|
+
urls: string[];
|
|
11
|
+
}>>;
|
|
12
|
+
} & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & import("cmd-ts/dist/cjs/helpdoc.js").ProvidesHelp & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/argparser.js").Register & import("cmd-ts/dist/cjs/runner.js").Handling<{
|
|
13
|
+
json: boolean;
|
|
14
|
+
jsons: boolean;
|
|
15
|
+
pem: boolean;
|
|
16
|
+
env: boolean;
|
|
17
|
+
presetKey: string;
|
|
18
|
+
envPrefix: string;
|
|
19
|
+
urls: string[];
|
|
20
|
+
}, Promise<void>> & {
|
|
21
|
+
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
22
|
+
} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import * as rt from "@fireproof/core-runtime";
|
|
2
|
+
import { command, restPositionals, string, option, flag } from "cmd-ts";
|
|
3
|
+
import { exportSPKI } from "jose";
|
|
4
|
+
export function wellKnownCmd(_sthis) {
|
|
5
|
+
return command({
|
|
6
|
+
name: "well-known",
|
|
7
|
+
description: "Fetch well-known JWKS from URLs",
|
|
8
|
+
version: "1.0.0",
|
|
9
|
+
args: {
|
|
10
|
+
json: flag({
|
|
11
|
+
long: "json",
|
|
12
|
+
description: "Output as JSON (default)",
|
|
13
|
+
defaultValue: () => false,
|
|
14
|
+
}),
|
|
15
|
+
jsons: flag({
|
|
16
|
+
long: "jsons",
|
|
17
|
+
description: "Output as single-line quoted JSON string",
|
|
18
|
+
defaultValue: () => false,
|
|
19
|
+
}),
|
|
20
|
+
pem: flag({
|
|
21
|
+
long: "pem",
|
|
22
|
+
description: "Output as PEM format per key",
|
|
23
|
+
defaultValue: () => false,
|
|
24
|
+
}),
|
|
25
|
+
env: flag({
|
|
26
|
+
long: "env",
|
|
27
|
+
description: "Output as environment variables with single-lined PEM",
|
|
28
|
+
defaultValue: () => false,
|
|
29
|
+
}),
|
|
30
|
+
presetKey: option({
|
|
31
|
+
type: string,
|
|
32
|
+
long: "presetKey",
|
|
33
|
+
defaultValue: () => "",
|
|
34
|
+
description: "Preset key to include (will be processed with coerceJWKPublic)",
|
|
35
|
+
}),
|
|
36
|
+
envPrefix: option({
|
|
37
|
+
type: string,
|
|
38
|
+
long: "env-prefix",
|
|
39
|
+
defaultValue: () => "CLERK_PUB_JWT_KEY",
|
|
40
|
+
description: "Prefix for environment variable names (used with --env)",
|
|
41
|
+
}),
|
|
42
|
+
urls: restPositionals({
|
|
43
|
+
type: string,
|
|
44
|
+
displayName: "urls",
|
|
45
|
+
description: "URLs to fetch well-known JWKS from",
|
|
46
|
+
}),
|
|
47
|
+
},
|
|
48
|
+
handler: async (args) => {
|
|
49
|
+
const urls = args.urls.flatMap((url) => url.split(",").map((u) => u.trim())).filter((u) => u.length > 0);
|
|
50
|
+
const presetKeys = args.presetKey ? await rt.sts.coerceJWKPublic(_sthis, args.presetKey) : [];
|
|
51
|
+
const results = urls.length > 0
|
|
52
|
+
? await rt.sts.fetchWellKnownJwks(urls, {
|
|
53
|
+
fetch: globalThis.fetch,
|
|
54
|
+
fetchTimeoutMs: 5000,
|
|
55
|
+
})
|
|
56
|
+
: [];
|
|
57
|
+
if (urls.length === 0 && presetKeys.length === 0) {
|
|
58
|
+
console.error("Error: At least one URL or presetKey must be provided");
|
|
59
|
+
process.exit(1);
|
|
60
|
+
}
|
|
61
|
+
const hasCustomEnvPrefix = args.envPrefix !== "CLERK_PUB_JWT_KEY";
|
|
62
|
+
const format = args.pem ? "pem" : args.env || hasCustomEnvPrefix ? "env" : args.jsons ? "jsons" : "json";
|
|
63
|
+
const keyMap = new Map();
|
|
64
|
+
for (const key of presetKeys) {
|
|
65
|
+
if (key.kid) {
|
|
66
|
+
keyMap.set(key.kid, key);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
keyMap.set(JSON.stringify(key), key);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
for (const result of results) {
|
|
73
|
+
if (result.type === "ok") {
|
|
74
|
+
for (const key of result.keys) {
|
|
75
|
+
if (key.kid) {
|
|
76
|
+
keyMap.set(key.kid, key);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
keyMap.set(JSON.stringify(key), key);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
const combinedOutput = { keys: Array.from(keyMap.values()) };
|
|
85
|
+
switch (format) {
|
|
86
|
+
case "json":
|
|
87
|
+
console.log(JSON.stringify(combinedOutput, null, 2));
|
|
88
|
+
break;
|
|
89
|
+
case "pem":
|
|
90
|
+
{
|
|
91
|
+
for (const jwk of combinedOutput.keys) {
|
|
92
|
+
const rKey = await rt.sts.importJWK(jwk);
|
|
93
|
+
if (rKey.isErr()) {
|
|
94
|
+
console.error(`Error importing JWK: ${rKey.Err()}`);
|
|
95
|
+
process.exit(1);
|
|
96
|
+
}
|
|
97
|
+
console.log(await exportSPKI(rKey.Ok().key));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
break;
|
|
101
|
+
case "env":
|
|
102
|
+
console.log(`${args.envPrefix}=${JSON.stringify(JSON.stringify(combinedOutput))}`);
|
|
103
|
+
break;
|
|
104
|
+
case "jsons":
|
|
105
|
+
default:
|
|
106
|
+
console.log(JSON.stringify(combinedOutput));
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=well-known-cmd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"well-known-cmd.js","sourceRoot":"","sources":["../jsr/well-known-cmd.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,18 @@ import * as rt from "@fireproof/core-runtime";
|
|
|
3
3
|
import { param } from "@adviser/cement";
|
|
4
4
|
import fs from "fs/promises";
|
|
5
5
|
export async function writeEnvFile(sthis, envFname, outFname, env, vals, doNotOverwrite, json) {
|
|
6
|
+
let render;
|
|
7
|
+
if (json) {
|
|
8
|
+
render = JSON.stringify(vals, null, 2);
|
|
9
|
+
}
|
|
10
|
+
else {
|
|
11
|
+
render = Object.entries(vals)
|
|
12
|
+
.map(([k, v]) => `${k}=${v}`)
|
|
13
|
+
.join("\n");
|
|
14
|
+
}
|
|
6
15
|
if (outFname === "-") {
|
|
7
|
-
|
|
16
|
+
process.stdout.write(render + "\n");
|
|
17
|
+
return "-";
|
|
8
18
|
}
|
|
9
19
|
const fname = outFname ?? sthis.pathOps.join(sthis.pathOps.dirname(envFname), `.dev.vars.${env}`);
|
|
10
20
|
if (doNotOverwrite &&
|
|
@@ -14,16 +24,7 @@ export async function writeEnvFile(sthis, envFname, outFname, env, vals, doNotOv
|
|
|
14
24
|
.catch(() => false))) {
|
|
15
25
|
return fname;
|
|
16
26
|
}
|
|
17
|
-
|
|
18
|
-
if (json) {
|
|
19
|
-
render = JSON.stringify(vals, null, 2);
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
render = Object.entries(vals)
|
|
23
|
-
.map(([k, v]) => `${k}=${v}`)
|
|
24
|
-
.join("\n");
|
|
25
|
-
}
|
|
26
|
-
await fs.writeFile(outFname ?? fname, render);
|
|
27
|
+
await fs.writeFile(fname, render);
|
|
27
28
|
return fname;
|
|
28
29
|
}
|
|
29
30
|
export function writeEnvCmd(sthis) {
|
|
@@ -100,4 +101,4 @@ export function writeEnvCmd(sthis) {
|
|
|
100
101
|
},
|
|
101
102
|
});
|
|
102
103
|
}
|
|
103
|
-
//# sourceMappingURL=write-env.js.map
|
|
104
|
+
//# sourceMappingURL=write-env-cmd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"write-env-cmd.js","sourceRoot":"","sources":["../jsr/write-env-cmd.ts"],"names":[],"mappings":"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"}
|
package/write-env.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"write-env.js","sourceRoot":"","sources":["../jsr/write-env.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|