@fireproof/core-cli 0.24.2-dev-cloud-api → 0.24.2-dev-clerk
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 +39 -20
- 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 +21 -26
- package/retry-cmd.d.ts +14 -0
- package/retry-cmd.js +96 -0
- package/retry-cmd.js.map +1 -0
- package/test-container-cmd.d.ts +10 -10
- package/tsc-cmd.js +4 -2
- package/tsc-cmd.js.map +1 -1
- 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 +111 -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) => {
|
|
@@ -409,7 +417,9 @@ export function buildCmd(sthis) {
|
|
|
409
417
|
},
|
|
410
418
|
});
|
|
411
419
|
if (!args.noBuild) {
|
|
412
|
-
await $ `pnpm run build
|
|
420
|
+
await $ `pnpm run build`.catch((err) => {
|
|
421
|
+
process.exit(err.exitCode);
|
|
422
|
+
});
|
|
413
423
|
}
|
|
414
424
|
for (const f of ["package.json", "README.md", "LICENSE.md"]) {
|
|
415
425
|
await fs.copyFile(f, path.join("../npm", f));
|
|
@@ -418,7 +428,10 @@ export function buildCmd(sthis) {
|
|
|
418
428
|
const jsrConf = await buildJsrConf(packageJson, version.prefixedVersion);
|
|
419
429
|
await fs.writeJSON("jsr.json", jsrConf, { spaces: 2 });
|
|
420
430
|
if (!isPrivate(packageJson.originalPackageJson)) {
|
|
421
|
-
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();
|
|
432
|
+
if (res.exitCode !== 0) {
|
|
433
|
+
throw new Error(`Failed to pack the package.`);
|
|
434
|
+
}
|
|
422
435
|
}
|
|
423
436
|
}
|
|
424
437
|
cd("../npm");
|
|
@@ -430,7 +443,10 @@ export function buildCmd(sthis) {
|
|
|
430
443
|
if (args.packDestDir) {
|
|
431
444
|
await fs.copyFile(path.join(path.dirname(args.packDestDir), ".gitignore"), ".gitignore");
|
|
432
445
|
await fs.copyFile(path.join(path.dirname(args.packDestDir), ".npmignore"), ".npmignore");
|
|
433
|
-
await $ `pnpm pack --out "${args.packDestDir}/%s.tgz"`;
|
|
446
|
+
const res = await $ `pnpm pack --out "${args.packDestDir}/%s.tgz"`;
|
|
447
|
+
if (res.exitCode !== 0) {
|
|
448
|
+
throw new Error(`Failed to pack the package.`);
|
|
449
|
+
}
|
|
434
450
|
}
|
|
435
451
|
}
|
|
436
452
|
else {
|
|
@@ -457,7 +473,10 @@ export function buildCmd(sthis) {
|
|
|
457
473
|
}
|
|
458
474
|
const registry = ["--registry", args.registry];
|
|
459
475
|
const tagsOpts = tags.map((tag) => ["--tag", tag]).flat();
|
|
460
|
-
await $ `${["pnpm", "publish", "--access", "public", ...registry, "--no-git-checks", ...tagsOpts]}
|
|
476
|
+
const res = await $ `${["pnpm", "publish", "--access", "public", ...registry, "--no-git-checks", ...tagsOpts]}`.nothrow();
|
|
477
|
+
if (res.exitCode !== 0) {
|
|
478
|
+
throw new Error(`Failed to publish the package.`);
|
|
479
|
+
}
|
|
461
480
|
}
|
|
462
481
|
},
|
|
463
482
|
});
|
package/build-cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"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"}
|
|
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;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,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;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;IAE7C,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;IAGjE,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,QAAQ,EAAE,IAAI,CAAC;gBACb,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,0EAA0E;aACxF,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,0FAA0F;aACxG,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,IAAI,WAAW,GAAG,MAAM,gBAAgB,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACpF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CACT,wCAAwC,EACxC,WAAW,CAAC,kBAAkB,CAAC,IAAI,EACnC,SAAS,EACT,WAAW,CAAC,kBAAkB,CAAC,OAAO,CACvC,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;gBACrF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC5D,WAAW,GAAG;oBACZ,GAAG,WAAW;oBACd,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,kBAAkB,EAAE;wBACrE,gBAAgB,EAAE,OAAO,CAAC,eAAe;qBAC1C,CAAC;iBACH,CAAC;YACJ,CAAC;YACD,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,OAAO,EAAE,CAAC;oBACtG,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,OAAO,EAAE,CAAC;gBACzH,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"}
|
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.2-dev-
|
|
3
|
+
"version": "0.24.2-dev-clerk",
|
|
4
4
|
"description": "Live ledger for the web.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": "./run.js",
|
|
@@ -31,31 +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.2-dev-
|
|
36
|
-
"@fireproof/core-keybag": "0.24.2-dev-
|
|
37
|
-
"@fireproof/core-runtime": "0.24.2-dev-
|
|
38
|
-
"@fireproof/core-types-base": "0.24.2-dev-
|
|
39
|
-
"@fireproof/vendor": "0.24.2-dev-
|
|
40
|
-
"@hono/node-server": "
|
|
41
|
-
"@
|
|
42
|
-
"
|
|
43
|
-
"
|
|
44
|
-
"
|
|
45
|
-
"
|
|
46
|
-
"
|
|
47
|
-
"
|
|
48
|
-
"
|
|
49
|
-
"
|
|
50
|
-
"
|
|
51
|
-
"
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
"@fireproof/core-cli": "0.24.2-dev-cloud-api",
|
|
55
|
-
"@types/fs-extra": "^11.0.4",
|
|
56
|
-
"@types/semver": "^7.7.1",
|
|
57
|
-
"tsx": "^4.20.4",
|
|
58
|
-
"vitest": "^4.0.8"
|
|
34
|
+
"@adviser/cement": "0.5.5",
|
|
35
|
+
"@fireproof/core-device-id": "0.24.2-dev-clerk",
|
|
36
|
+
"@fireproof/core-keybag": "0.24.2-dev-clerk",
|
|
37
|
+
"@fireproof/core-runtime": "0.24.2-dev-clerk",
|
|
38
|
+
"@fireproof/core-types-base": "0.24.2-dev-clerk",
|
|
39
|
+
"@fireproof/vendor": "0.24.2-dev-clerk",
|
|
40
|
+
"@hono/node-server": "1.19.6",
|
|
41
|
+
"@pnpm/lockfile-file": "9.1.3",
|
|
42
|
+
"@typescript/native-preview": "7.0.0-dev.20251201.1",
|
|
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.7",
|
|
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"
|
|
59
54
|
},
|
|
60
55
|
"scripts": {
|
|
61
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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"}
|
package/test-container-cmd.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { SuperThis } from "@fireproof/core-types-base";
|
|
2
2
|
export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
3
3
|
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
4
|
-
command: "build";
|
|
5
|
-
args: {};
|
|
6
|
-
} | {
|
|
7
4
|
command: "publish";
|
|
8
5
|
args: {
|
|
9
6
|
repoUrl: string;
|
|
@@ -13,6 +10,9 @@ export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-
|
|
|
13
10
|
dockerfile: string;
|
|
14
11
|
context: string;
|
|
15
12
|
};
|
|
13
|
+
} | {
|
|
14
|
+
command: "build";
|
|
15
|
+
args: {};
|
|
16
16
|
} | {
|
|
17
17
|
command: "template";
|
|
18
18
|
args: {
|
|
@@ -31,9 +31,6 @@ export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-
|
|
|
31
31
|
};
|
|
32
32
|
}>>;
|
|
33
33
|
} & import("cmd-ts/dist/cjs/helpdoc.js").Named & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Versioned> & import("cmd-ts/dist/cjs/helpdoc.js").PrintHelp & 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<{
|
|
34
|
-
command: "build";
|
|
35
|
-
args: {};
|
|
36
|
-
} | {
|
|
37
34
|
command: "publish";
|
|
38
35
|
args: {
|
|
39
36
|
repoUrl: string;
|
|
@@ -43,6 +40,9 @@ export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-
|
|
|
43
40
|
dockerfile: string;
|
|
44
41
|
context: string;
|
|
45
42
|
};
|
|
43
|
+
} | {
|
|
44
|
+
command: "build";
|
|
45
|
+
args: {};
|
|
46
46
|
} | {
|
|
47
47
|
command: "template";
|
|
48
48
|
args: {
|
|
@@ -60,20 +60,20 @@ export declare function testContainerCmd(sthis: SuperThis): Partial<import("cmd-
|
|
|
60
60
|
context: string;
|
|
61
61
|
};
|
|
62
62
|
}, {
|
|
63
|
-
command: "
|
|
63
|
+
command: "publish";
|
|
64
64
|
value: Promise<void>;
|
|
65
65
|
} | {
|
|
66
|
-
command: "
|
|
66
|
+
command: "build";
|
|
67
67
|
value: Promise<void>;
|
|
68
68
|
} | {
|
|
69
69
|
command: "template";
|
|
70
70
|
value: Promise<void>;
|
|
71
71
|
}> & {
|
|
72
72
|
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
73
|
-
command: "
|
|
73
|
+
command: "publish";
|
|
74
74
|
value: Promise<void>;
|
|
75
75
|
} | {
|
|
76
|
-
command: "
|
|
76
|
+
command: "build";
|
|
77
77
|
value: Promise<void>;
|
|
78
78
|
} | {
|
|
79
79
|
command: "template";
|