@fireproof/core-cli 0.24.15 → 0.24.16

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.
Files changed (92) hide show
  1. package/build-cmd.test.js +1 -1
  2. package/build-cmd.test.js.map +1 -1
  3. package/cli-ctx.d.ts +6 -0
  4. package/cli-ctx.js +2 -0
  5. package/cli-ctx.js.map +1 -0
  6. package/cmd-evento.d.ts +24 -0
  7. package/cmd-evento.js +85 -0
  8. package/cmd-evento.js.map +1 -0
  9. package/{build-cmd.d.ts → cmds/build-cmd.d.ts} +41 -4
  10. package/{build-cmd.js → cmds/build-cmd.js} +211 -152
  11. package/cmds/build-cmd.js.map +1 -0
  12. package/{cloud-token-key-cmd.d.ts → cmds/cloud-token-key-cmd.d.ts} +20 -4
  13. package/cmds/cloud-token-key-cmd.js +114 -0
  14. package/cmds/cloud-token-key-cmd.js.map +1 -0
  15. package/cmds/dependabot-cmd.d.ts +33 -0
  16. package/cmds/dependabot-cmd.js +157 -0
  17. package/cmds/dependabot-cmd.js.map +1 -0
  18. package/cmds/device-id-cmd.d.ts +248 -0
  19. package/cmds/device-id-cmd.js +762 -0
  20. package/cmds/device-id-cmd.js.map +1 -0
  21. package/cmds/index.d.ts +12 -0
  22. package/cmds/index.js +13 -0
  23. package/cmds/index.js.map +1 -0
  24. package/{pre-signed-url.d.ts → cmds/pre-signed-url.d.ts} +26 -4
  25. package/{pre-signed-url.js → cmds/pre-signed-url.js} +63 -22
  26. package/cmds/pre-signed-url.js.map +1 -0
  27. package/cmds/retry-cmd.d.ts +31 -0
  28. package/cmds/retry-cmd.js +156 -0
  29. package/cmds/retry-cmd.js.map +1 -0
  30. package/{set-scripts-cmd.d.ts → cmds/set-scripts-cmd.d.ts} +40 -7
  31. package/cmds/set-scripts-cmd.js +213 -0
  32. package/cmds/set-scripts-cmd.js.map +1 -0
  33. package/cmds/test-container-cmd.d.ts +135 -0
  34. package/cmds/test-container-cmd.js +440 -0
  35. package/cmds/test-container-cmd.js.map +1 -0
  36. package/{tsc-cmd.d.ts → cmds/tsc-cmd.d.ts} +19 -3
  37. package/cmds/tsc-cmd.js +75 -0
  38. package/cmds/tsc-cmd.js.map +1 -0
  39. package/cmds/update-deps-cmd.d.ts +33 -0
  40. package/cmds/update-deps-cmd.js +194 -0
  41. package/cmds/update-deps-cmd.js.map +1 -0
  42. package/{well-known-cmd.d.ts → cmds/well-known-cmd.d.ts} +24 -4
  43. package/cmds/well-known-cmd.js +154 -0
  44. package/cmds/well-known-cmd.js.map +1 -0
  45. package/cmds/write-env-cmd.d.ts +43 -0
  46. package/cmds/write-env-cmd.js +145 -0
  47. package/cmds/write-env-cmd.js.map +1 -0
  48. package/create-cli-stream.d.ts +10 -0
  49. package/create-cli-stream.js +34 -0
  50. package/create-cli-stream.js.map +1 -0
  51. package/evento-test-helper.d.ts +11 -0
  52. package/evento-test-helper.js +40 -0
  53. package/evento-test-helper.js.map +1 -0
  54. package/evento.test.d.ts +1 -0
  55. package/evento.test.js +122 -0
  56. package/evento.test.js.map +1 -0
  57. package/index.d.ts +5 -0
  58. package/index.js +6 -0
  59. package/index.js.map +1 -0
  60. package/main.js +130 -31
  61. package/main.js.map +1 -1
  62. package/package.json +9 -8
  63. package/run.js +0 -1
  64. package/version-pinner.d.ts +1 -1
  65. package/build-cmd.js.map +0 -1
  66. package/cloud-token-key-cmd.js +0 -73
  67. package/cloud-token-key-cmd.js.map +0 -1
  68. package/dependabot-cmd.d.ts +0 -16
  69. package/dependabot-cmd.js +0 -102
  70. package/dependabot-cmd.js.map +0 -1
  71. package/device-id-cmd.d.ts +0 -150
  72. package/device-id-cmd.js +0 -576
  73. package/device-id-cmd.js.map +0 -1
  74. package/pre-signed-url.js.map +0 -1
  75. package/retry-cmd.d.ts +0 -14
  76. package/retry-cmd.js +0 -96
  77. package/retry-cmd.js.map +0 -1
  78. package/set-scripts-cmd.js +0 -155
  79. package/set-scripts-cmd.js.map +0 -1
  80. package/test-container-cmd.d.ts +0 -82
  81. package/test-container-cmd.js +0 -332
  82. package/test-container-cmd.js.map +0 -1
  83. package/tsc-cmd.js +0 -39
  84. package/tsc-cmd.js.map +0 -1
  85. package/update-deps-cmd.d.ts +0 -16
  86. package/update-deps-cmd.js +0 -147
  87. package/update-deps-cmd.js.map +0 -1
  88. package/well-known-cmd.js +0 -111
  89. package/well-known-cmd.js.map +0 -1
  90. package/write-env-cmd.d.ts +0 -23
  91. package/write-env-cmd.js +0 -104
  92. package/write-env-cmd.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"create-cli-stream.js","sourceRoot":"","sources":["../jsr/create-cli-stream.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,eAAe;IAC7B,MAAM,OAAO,GAAG,IAAI,eAAe,EAAyB,CAAC;IAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC5C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAiB,CAAC;IACzC,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,QAAQ;QACxB,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClC,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,CAAC,CAAC,WAAoC,EAAE,EAAE;YACjD,OAAO,CAAC,IAAa,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;qBAC9C,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACf,MAAM,QAAQ,GAAG;wBACf,IAAI,EAAE,YAAY;wBAClB,KAAK,EAAE;4BACL,GAAG,EAAE,IAAI;4BACT,YAAY,EAAE,MAAM;yBACrB;wBACD,MAAM;qBACyB,CAAC;oBAClC,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChC,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;qBACrB,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpB,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;QACJ,CAAC,CAAkD;KACpD,CAAC;AACJ,CAAC"}
@@ -0,0 +1,11 @@
1
+ import { EventoSendProvider, HandleTriggerCtx, Result } from "@adviser/cement";
2
+ import { WrapCmdTSMsg } from "./cmd-evento.js";
3
+ export declare class TestSendProvider implements EventoSendProvider<unknown, unknown, unknown> {
4
+ readonly results: WrapCmdTSMsg<unknown>[];
5
+ send<IS, OS>(_trigger: HandleTriggerCtx<unknown, unknown, unknown>, data: IS): Promise<Result<OS, Error>>;
6
+ done(_trigger: HandleTriggerCtx<unknown, unknown, unknown>): Promise<Result<void>>;
7
+ }
8
+ export declare function triggerEvento(opts: {
9
+ reqType: string;
10
+ raw: unknown;
11
+ }): Promise<WrapCmdTSMsg<unknown>>;
@@ -0,0 +1,40 @@
1
+ import { AppContext, Result } from "@adviser/cement";
2
+ import { ensureSuperThis } from "@fireproof/core-runtime";
3
+ import { createCliStream } from "./create-cli-stream.js";
4
+ import { cmdTsEvento } from "./cmd-evento.js";
5
+ export class TestSendProvider {
6
+ results = [];
7
+ async send(_trigger, data) {
8
+ this.results.push(data);
9
+ return Promise.resolve(Result.Ok());
10
+ }
11
+ done(_trigger) {
12
+ return Promise.resolve(Result.Ok());
13
+ }
14
+ }
15
+ export async function triggerEvento(opts) {
16
+ const evento = cmdTsEvento();
17
+ const send = new TestSendProvider();
18
+ const sthis = ensureSuperThis();
19
+ const ctx = { sthis, cliStream: createCliStream() };
20
+ const appCtx = new AppContext().set("cliCtx", ctx);
21
+ const request = {
22
+ type: "msg.cmd-ts",
23
+ cmdTs: { raw: opts.raw, outputFormat: "text" },
24
+ result: { type: opts.reqType, ...opts.raw },
25
+ };
26
+ const triggered = await evento.trigger({ ctx: appCtx, send, request });
27
+ if (triggered.isErr()) {
28
+ throw triggered.Err();
29
+ }
30
+ const triggerCtx = triggered.unwrap();
31
+ if (triggerCtx.error) {
32
+ throw triggerCtx.error;
33
+ }
34
+ const result = send.results[send.results.length - 1];
35
+ if (!result) {
36
+ throw new Error(`No evento response emitted for ${opts.reqType}`);
37
+ }
38
+ return result;
39
+ }
40
+ //# sourceMappingURL=evento-test-helper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"evento-test-helper.js","sourceRoot":"","sources":["../jsr/evento-test-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAwC,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgB,MAAM,iBAAiB,CAAC;AAE5D,MAAM,OAAO,gBAAgB;IAClB,OAAO,GAA4B,EAAE,CAAC;IAC/C,KAAK,CAAC,IAAI,CAAS,QAAqD,EAAE,IAAQ;QAChF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAA6B,CAAC,CAAC;QACjD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,CAAC,QAAqD;QACxD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAuC;IACzE,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACpC,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,MAAM,GAAG,GAAW,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,OAAO,GAA0B;QACrC,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE;QAC9C,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,GAAI,IAAI,CAAC,GAA+B,EAAE;KACzE,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACvE,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;QACtB,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;IACtC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,UAAU,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
package/evento.test.js ADDED
@@ -0,0 +1,122 @@
1
+ import { describe, it, expect } from "vitest";
2
+ import { triggerEvento } from "./evento-test-helper.js";
3
+ import { isResKey } from "./cmds/cloud-token-key-cmd.js";
4
+ import { isResWellKnown } from "./cmds/well-known-cmd.js";
5
+ import { isResWriteEnv } from "./cmds/write-env-cmd.js";
6
+ import { isResDeviceIdCreate, isResDeviceIdExport } from "./cmds/device-id-cmd.js";
7
+ import { isResRetry } from "./cmds/retry-cmd.js";
8
+ describe("evento pipeline", () => {
9
+ describe("key --generatePair", () => {
10
+ it("generates a key pair with public and secret env vars", async () => {
11
+ const wmsg = await triggerEvento({
12
+ reqType: "core-cli.key",
13
+ raw: { generatePair: true, ourToJWK: "", JWKToour: "" },
14
+ });
15
+ const msg = wmsg.result;
16
+ expect(isResKey(msg)).toBe(true);
17
+ if (isResKey(msg)) {
18
+ expect(msg.output).toContain("CLOUD_SESSION_TOKEN_PUBLIC=");
19
+ expect(msg.output).toContain("CLOUD_SESSION_TOKEN_SECRET=");
20
+ }
21
+ });
22
+ });
23
+ describe("wellKnown", () => {
24
+ it("returns JSON with keys array when given a presetKey", async () => {
25
+ const presetKey = JSON.stringify({
26
+ kty: "EC",
27
+ crv: "P-256",
28
+ x: "f83OJ3D2xF1Bg8vub9tLe1gHMzV76e8Tus9uPHvRVEU",
29
+ y: "x_FEzRu9m36HLN_tue659LNpXW6pCyStikYjKIWI5a0",
30
+ kid: "test-key-1",
31
+ });
32
+ const wmsg = await triggerEvento({
33
+ reqType: "core-cli.req-well-known",
34
+ raw: {
35
+ json: true,
36
+ jsons: false,
37
+ pem: false,
38
+ env: false,
39
+ presetKey,
40
+ envPrefix: "CLERK_PUB_JWT_KEY",
41
+ urls: [],
42
+ },
43
+ });
44
+ const msg = wmsg.result;
45
+ expect(isResWellKnown(msg)).toBe(true);
46
+ if (isResWellKnown(msg)) {
47
+ const parsed = JSON.parse(msg.output);
48
+ expect(parsed).toHaveProperty("keys");
49
+ expect(Array.isArray(parsed.keys)).toBe(true);
50
+ expect(parsed.keys.length).toBeGreaterThan(0);
51
+ expect(parsed.keys[0].kid).toBe("test-key-1");
52
+ }
53
+ });
54
+ });
55
+ describe("writeEnv", () => {
56
+ it("writes env vars to stdout when --out -", async () => {
57
+ const wmsg = await triggerEvento({
58
+ reqType: "core-cli.write-env",
59
+ raw: {
60
+ wranglerToml: "./wrangler.toml",
61
+ env: "test",
62
+ doNotOverwrite: false,
63
+ excludeSecrets: false,
64
+ fromEnv: ["HOME"],
65
+ out: "-",
66
+ json: false,
67
+ },
68
+ });
69
+ const msg = wmsg.result;
70
+ expect(isResWriteEnv(msg)).toBe(true);
71
+ if (isResWriteEnv(msg)) {
72
+ expect(msg.output).toBe("");
73
+ }
74
+ });
75
+ });
76
+ describe("deviceId create", () => {
77
+ it("creates or finds a device ID with fingerprint", async () => {
78
+ const wmsg = await triggerEvento({
79
+ reqType: "core-cli.device-id-create",
80
+ raw: { force: false },
81
+ });
82
+ const msg = wmsg.result;
83
+ expect(isResDeviceIdCreate(msg)).toBe(true);
84
+ if (isResDeviceIdCreate(msg)) {
85
+ expect(msg.output).toContain("Fingerprint");
86
+ }
87
+ });
88
+ });
89
+ describe("deviceId export", () => {
90
+ it("exports public key as JSON", async () => {
91
+ await triggerEvento({
92
+ reqType: "core-cli.device-id-create",
93
+ raw: { force: false },
94
+ });
95
+ const wmsg = await triggerEvento({
96
+ reqType: "core-cli.device-id-export",
97
+ raw: { private: false, json: true, public: true, cert: false },
98
+ });
99
+ const msg = wmsg.result;
100
+ expect(isResDeviceIdExport(msg)).toBe(true);
101
+ if (isResDeviceIdExport(msg)) {
102
+ const parsed = JSON.parse(msg.output);
103
+ expect(parsed).toHaveProperty("publicKey");
104
+ expect(parsed.publicKey).toHaveProperty("kty");
105
+ }
106
+ });
107
+ });
108
+ describe("retry", () => {
109
+ it("runs echo and succeeds with exitCode 0", async () => {
110
+ const wmsg = await triggerEvento({
111
+ reqType: "core-cli.retry",
112
+ raw: { retry: 1, timeout: 0, command: ["echo", "hello"] },
113
+ });
114
+ const msg = wmsg.result;
115
+ expect(isResRetry(msg)).toBe(true);
116
+ if (isResRetry(msg)) {
117
+ expect(msg.exitCode).toBe(0);
118
+ }
119
+ });
120
+ });
121
+ });
122
+ //# sourceMappingURL=evento.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"evento.test.js","sourceRoot":"","sources":["../jsr/evento.test.ts"],"names":[],"mappings":"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"}
package/index.d.ts ADDED
@@ -0,0 +1,5 @@
1
+ export * from "./cli-ctx.js";
2
+ export * from "./cmd-evento.js";
3
+ export * from "./create-cli-stream.js";
4
+ export * from "./version-pinner.js";
5
+ export * from "./cmds/index.js";
package/index.js ADDED
@@ -0,0 +1,6 @@
1
+ export * from "./cli-ctx.js";
2
+ export * from "./cmd-evento.js";
3
+ export * from "./create-cli-stream.js";
4
+ export * from "./version-pinner.js";
5
+ export * from "./cmds/index.js";
6
+ //# sourceMappingURL=index.js.map
package/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../jsr/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC"}
package/main.js CHANGED
@@ -1,44 +1,143 @@
1
+ import { AppContext, processStream, Result } from "@adviser/cement";
1
2
  import { ensureSuperThis } from "@fireproof/core-runtime";
2
- import { run, subcommands } from "cmd-ts";
3
3
  import { dotenv } from "zx";
4
- import { buildCmd } from "./build-cmd.js";
5
- import { setDependenciesCmd, setScriptsCmd } from "./set-scripts-cmd.js";
6
- import { handleTsc, tscCmd } from "./tsc-cmd.js";
7
- import { writeEnvCmd } from "./write-env-cmd.js";
8
- import { keyCmd } from "./cloud-token-key-cmd.js";
9
- import { preSignedUrlCmd } from "./pre-signed-url.js";
10
- import { dependabotCmd } from "./dependabot-cmd.js";
11
- import { testContainerCmd } from "./test-container-cmd.js";
12
- import { deviceIdCmd } from "./device-id-cmd.js";
13
- import { wellKnownCmd } from "./well-known-cmd.js";
14
- import { retryCmd } from "./retry-cmd.js";
15
- import { updateDepsCmd } from "./update-deps-cmd.js";
16
- (async () => {
4
+ import { runSafely, subcommands } from "cmd-ts";
5
+ import { err, isErr } from "cmd-ts/dist/cjs/Result.js";
6
+ import { createCliStream } from "./create-cli-stream.js";
7
+ import { cmdTsEvento, isCmdProgress } from "./cmd-evento.js";
8
+ import { buildCmd, isResBuild } from "./cmds/build-cmd.js";
9
+ import { setDependenciesCmd, setScriptsCmd, isResSetScripts, isResSetDependencies } from "./cmds/set-scripts-cmd.js";
10
+ import { handleTsc, tscCmd, isResTsc } from "./cmds/tsc-cmd.js";
11
+ import { writeEnvCmd, isResWriteEnv } from "./cmds/write-env-cmd.js";
12
+ import { keyCmd, isResKey } from "./cmds/cloud-token-key-cmd.js";
13
+ import { preSignedUrlCmd, isResPreSignedUrl } from "./cmds/pre-signed-url.js";
14
+ import { dependabotCmd, isResDependabot } from "./cmds/dependabot-cmd.js";
15
+ import { testContainerCmd, isResTestContainerBuild, isResTestContainerTemplate, isResTestContainerPublish, } from "./cmds/test-container-cmd.js";
16
+ import { deviceIdCmd, isResDeviceIdCreate, isResDeviceIdCsr, isResDeviceIdExport, isResDeviceIdCert, isResDeviceIdCaCert, isResDeviceIdRegister, } from "./cmds/device-id-cmd.js";
17
+ import { wellKnownCmd, isResWellKnown } from "./cmds/well-known-cmd.js";
18
+ import { retryCmd, isResRetry } from "./cmds/retry-cmd.js";
19
+ import { updateDepsCmd, isResUpdateDeps } from "./cmds/update-deps-cmd.js";
20
+ class OutputSelector {
21
+ tstream = new TransformStream();
22
+ outputStream = this.tstream.readable;
23
+ writer = this.tstream.writable.getWriter();
24
+ async send(_trigger, data) {
25
+ await this.writer.write(data);
26
+ return Promise.resolve(Result.Ok());
27
+ }
28
+ done(_trigger) {
29
+ this.writer.releaseLock();
30
+ this.tstream.writable.close();
31
+ return Promise.resolve(Result.Ok());
32
+ }
33
+ }
34
+ async function main() {
17
35
  dotenv.config(process.env.FP_ENV ?? ".env");
18
36
  const sthis = ensureSuperThis();
19
37
  if (process.argv[2] === "tsc") {
20
38
  return handleTsc(process.argv.slice(3), sthis);
21
39
  }
22
- const cmd = subcommands({
40
+ const ctx = {
41
+ sthis,
42
+ cliStream: createCliStream(),
43
+ };
44
+ const rs = await runSafely(subcommands({
23
45
  name: "core-cli",
24
46
  description: "fireproof/core-cli",
25
47
  version: "1.0.0",
26
48
  cmds: {
27
- tsc: tscCmd(sthis),
28
- key: keyCmd(sthis),
29
- writeEnv: writeEnvCmd(sthis),
30
- preSigned: preSignedUrlCmd(sthis),
31
- build: buildCmd(sthis),
32
- setScripts: setScriptsCmd(sthis),
33
- setDependencies: setDependenciesCmd(sthis),
34
- dependabot: dependabotCmd(sthis),
35
- testContainer: testContainerCmd(sthis),
36
- deviceId: deviceIdCmd(sthis),
37
- wellKnown: wellKnownCmd(sthis),
38
- retry: retryCmd(sthis),
39
- updateDeps: updateDepsCmd(sthis),
49
+ tsc: tscCmd(ctx),
50
+ key: keyCmd(ctx),
51
+ writeEnv: writeEnvCmd(ctx),
52
+ preSigned: preSignedUrlCmd(ctx),
53
+ build: buildCmd(ctx),
54
+ setScripts: setScriptsCmd(ctx),
55
+ setDependencies: setDependenciesCmd(ctx),
56
+ dependabot: dependabotCmd(ctx),
57
+ testContainer: testContainerCmd(ctx),
58
+ deviceId: deviceIdCmd(ctx),
59
+ wellKnown: wellKnownCmd(ctx),
60
+ retry: retryCmd(ctx),
61
+ updateDeps: updateDepsCmd(ctx),
40
62
  },
41
- });
42
- await run(cmd, process.argv.slice(2));
43
- })().catch(console.error);
63
+ }), process.argv.slice(2));
64
+ if (isErr(rs)) {
65
+ console.error(err(rs).error.error.config.message);
66
+ process.exit(err(rs).error.error.config.exitCode);
67
+ }
68
+ const outputSelector = new OutputSelector();
69
+ const evento = cmdTsEvento();
70
+ const appCtx = new AppContext().set("cliCtx", ctx);
71
+ await Promise.all([
72
+ processStream(ctx.cliStream.stream, async (msg) => {
73
+ const triggered = await evento.trigger({
74
+ ctx: appCtx,
75
+ send: outputSelector,
76
+ request: msg,
77
+ });
78
+ if (triggered.isErr()) {
79
+ throw triggered.Err();
80
+ }
81
+ const triggerCtx = triggered.unwrap();
82
+ if (triggerCtx.error) {
83
+ throw triggerCtx.error;
84
+ }
85
+ }, processStream(outputSelector.outputStream, async (wmsg) => {
86
+ const msg = wmsg.result;
87
+ if (isCmdProgress(msg)) {
88
+ switch (msg.level) {
89
+ case "warn":
90
+ console.warn(msg.message);
91
+ break;
92
+ case "error":
93
+ console.error(msg.message);
94
+ break;
95
+ case "info":
96
+ default:
97
+ console.log(msg.message);
98
+ break;
99
+ }
100
+ return;
101
+ }
102
+ switch (true) {
103
+ case isResWellKnown(msg):
104
+ case isResWriteEnv(msg):
105
+ case isResKey(msg):
106
+ case isResPreSignedUrl(msg):
107
+ case isResDependabot(msg):
108
+ case isResUpdateDeps(msg):
109
+ case isResSetScripts(msg):
110
+ case isResSetDependencies(msg):
111
+ case isResTsc(msg):
112
+ case isResTestContainerBuild(msg):
113
+ case isResTestContainerTemplate(msg):
114
+ case isResTestContainerPublish(msg):
115
+ case isResDeviceIdCreate(msg):
116
+ case isResDeviceIdCsr(msg):
117
+ case isResDeviceIdExport(msg):
118
+ case isResDeviceIdCert(msg):
119
+ case isResDeviceIdCaCert(msg):
120
+ case isResDeviceIdRegister(msg):
121
+ case isResBuild(msg): {
122
+ if (msg.output) {
123
+ console.log(msg.output);
124
+ }
125
+ break;
126
+ }
127
+ case isResRetry(msg): {
128
+ if (msg.output) {
129
+ console.log(msg.output);
130
+ }
131
+ process.exit(msg.exitCode);
132
+ break;
133
+ }
134
+ }
135
+ })),
136
+ ctx.cliStream.close(),
137
+ ]);
138
+ }
139
+ main().then(() => process.exit(0), (e) => {
140
+ console.error("Error in core-cli:", e);
141
+ process.exit(1);
142
+ });
44
143
  //# sourceMappingURL=main.js.map
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,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;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,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;YACtB,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;SACjC;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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../jsr/main.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fireproof/core-cli",
3
- "version": "0.24.15",
3
+ "version": "0.24.16",
4
4
  "description": "Live ledger for the web.",
5
5
  "type": "module",
6
6
  "bin": {
@@ -38,20 +38,21 @@
38
38
  },
39
39
  "dependencies": {
40
40
  "@adviser/cement": "~0.5.34",
41
- "@fireproof/core-device-id": "0.24.15",
42
- "@fireproof/core-keybag": "0.24.15",
43
- "@fireproof/core-runtime": "0.24.15",
44
- "@fireproof/core-types-base": "0.24.15",
45
- "@fireproof/vendor": "0.24.15",
41
+ "@fireproof/core-device-id": "0.24.16",
42
+ "@fireproof/core-keybag": "0.24.16",
43
+ "@fireproof/core-runtime": "0.24.16",
44
+ "@fireproof/core-types-base": "0.24.16",
45
+ "@fireproof/vendor": "0.24.16",
46
46
  "@hono/node-server": "~1.19.11",
47
47
  "@pnpm/lockfile-file": "~9.1.3",
48
- "@typescript/native-preview": "~7.0.0-dev.20260312.1",
48
+ "@typescript/native-preview": "~7.0.0-dev.20260328.1",
49
+ "arktype": "~2.2.0",
49
50
  "aws4fetch": "~1.0.20",
50
51
  "cmd-ts": "~0.15.0",
51
52
  "find-up": "~8.0.0",
52
53
  "fs-extra": "~11.3.4",
53
54
  "hono": "~4.12.8",
54
- "jose": "~6.2.1",
55
+ "jose": "~6.2.2",
55
56
  "multiformats": "~13.4.2",
56
57
  "open": "~11.0.0",
57
58
  "semver": "~7.7.4",
package/run.js CHANGED
@@ -38,7 +38,6 @@ if (fs.existsSync(mainJs)) {
38
38
  import(addFile).catch((e) => console.error(e));
39
39
  } else {
40
40
  const restArgv = process.argv.slice(idxRunIdx + 1) ?? [];
41
- // console.log(">>>>>", restArgv)
42
41
  exec("tsx", [path.join(runDirectory, "main.ts"), ...restArgv], runDirectory);
43
42
  }
44
43
  // }
@@ -1,4 +1,4 @@
1
- import { PackageJson } from "./build-cmd.js";
1
+ import { PackageJson } from "./cmds/build-cmd.js";
2
2
  interface PinVersionOptions {
3
3
  readonly _3rdPartyVersionModifier?: "~" | "^" | "";
4
4
  readonly includeDevDeps?: boolean;
package/build-cmd.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"build-cmd.js","sourceRoot":"","sources":["../jsr/build-cmd.ts"],"names":[],"mappings":"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"}
@@ -1,73 +0,0 @@
1
- import { JWKPrivateSchema, JWKPublicSchema } from "@fireproof/core-types-base";
2
- import * as rt from "@fireproof/core-runtime";
3
- import { command, flag, option, string } from "cmd-ts";
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
- }
27
- export function keyCmd(sthis) {
28
- return command({
29
- name: "cli-key-cmds",
30
- description: "handle keys for cloud token generation",
31
- version: "1.0.0",
32
- args: {
33
- generatePair: flag({
34
- long: "generatePair",
35
- short: "g",
36
- }),
37
- ourToJWK: option({
38
- long: "ourToJWK",
39
- short: "o",
40
- defaultValue: () => "",
41
- type: string,
42
- }),
43
- JWKToour: option({
44
- long: "JWKToour",
45
- short: "j",
46
- defaultValue: () => "",
47
- type: string,
48
- }),
49
- },
50
- handler: async (args) => {
51
- switch (true) {
52
- case !!args.ourToJWK:
53
- {
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));
60
- }
61
- break;
62
- case args.generatePair:
63
- {
64
- const key = await rt.sts.SessionTokenService.generateKeyPair("ES256", { extractable: true });
65
- console.log(`${rt.sts.envKeyDefaults.PUBLIC}=${key.strings.publicKey}`);
66
- console.log(`${rt.sts.envKeyDefaults.SECRET}=${key.strings.privateKey}`);
67
- }
68
- break;
69
- }
70
- },
71
- });
72
- }
73
- //# sourceMappingURL=cloud-token-key-cmd.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"cloud-token-key-cmd.js","sourceRoot":"","sources":["../jsr/cloud-token-key-cmd.ts"],"names":[],"mappings":"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"}
@@ -1,16 +0,0 @@
1
- import { SuperThis } from "@fireproof/core-types-base";
2
- export declare function dependabotCmd(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
- rebase: boolean;
5
- apply: boolean;
6
- prNumber: string;
7
- list: boolean;
8
- }>>;
9
- } & 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<{
10
- rebase: boolean;
11
- apply: boolean;
12
- prNumber: string;
13
- list: boolean;
14
- }, Promise<void>> & {
15
- run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
16
- } & 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>;