@anvil-works/anvil-cli 0.8.0 → 0.9.0-canary.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/logger.d.ts CHANGED
@@ -29,16 +29,27 @@ export interface JsonResultEntry {
29
29
  error?: string;
30
30
  timestamp: string;
31
31
  }
32
+ type JsonResultOptions = Pick<JsonResultEntry, "message" | "data" | "error">;
33
+ export interface ResultOptions {
34
+ json: JsonResultOptions;
35
+ /** Whether the command succeeded. Defaults to true. */
36
+ success?: boolean;
37
+ /** A diagnostic to print alongside the result in text mode. */
38
+ note?: string;
39
+ }
32
40
  /** Get human-readable timestamp with timezone for verbose logging */
33
41
  export declare const verboseTimestamp: () => string;
42
+ /**
43
+ * Write a command's result to stdout.
44
+ *
45
+ * In text mode, the logger writes diagnostics to stderr so callers can capture results on stdout.
46
+ * In JSON mode, logJsonResult writes structured results to stdout alongside NDJSON logs and progress.
47
+ */
48
+ export declare function writeStdout(...args: any[]): void;
34
49
  /**
35
50
  * Output a result in JSON mode.
36
51
  */
37
- export declare function logJsonResult(success: boolean, options?: {
38
- message?: string;
39
- data?: unknown;
40
- error?: string;
41
- }): void;
52
+ export declare function logJsonResult(success: boolean, options?: JsonResultOptions): void;
42
53
  /**
43
54
  * Terminal UI used by executable commands, including prompts and spinners.
44
55
  * Embedded library calls use the logging-only interface in reporting.ts.
@@ -50,6 +61,7 @@ export interface Logger {
50
61
  warn(...args: any[]): void;
51
62
  error(...args: any[]): void;
52
63
  success(message: string): void;
64
+ result(text: string | readonly string[] | (() => readonly string[]), options: ResultOptions): void;
53
65
  progress(key: string, message: string): void;
54
66
  progressUpdate(key: string, message: string): void;
55
67
  progressEnd(key: string, message?: string): void;
@@ -62,6 +74,50 @@ export interface Logger {
62
74
  value: T;
63
75
  }>, defaultValue?: T, options?: PromptOptions): Promise<T>;
64
76
  }
77
+ /**
78
+ * Shared implementation for the CLI and library loggers: level filtering, JSON (NDJSON) mode,
79
+ * symbols and colours, pause/resume, and the confirm/select prompt helpers.
80
+ *
81
+ * Subclasses decide when debug/verbose output is enabled, how lines are written, how
82
+ * progress is shown in human-readable mode, and whether prompting is supported.
83
+ */
84
+ export declare abstract class BaseLogger implements Logger {
85
+ protected paused: boolean;
86
+ protected get jsonMode(): boolean;
87
+ protected isDebugEnabled(): boolean;
88
+ /** Verbose output is on with the --verbose flag or the `verbose` config setting. */
89
+ protected isVerboseEnabled(): boolean;
90
+ /**
91
+ * Write a human-readable line to stderr, unless paused. All logging is diagnostic;
92
+ * a command's result goes to stdout through result().
93
+ */
94
+ protected write(...args: any[]): void;
95
+ private writeLogJson;
96
+ private writeProgressJson;
97
+ result(text: string | readonly string[] | (() => readonly string[]), options: ResultOptions): void;
98
+ private logAt;
99
+ debug(...args: any[]): void;
100
+ verbose(...args: any[]): void;
101
+ info(...args: any[]): void;
102
+ warn(...args: any[]): void;
103
+ error(...args: any[]): void;
104
+ success(message: string): void;
105
+ progress(key: string, message: string): void;
106
+ progressUpdate(key: string, message: string): void;
107
+ progressEnd(key: string, message?: string): void;
108
+ /** Human-readable progress: static lines by default. */
109
+ protected showProgressStart(_key: string, message: string): void;
110
+ protected showProgressUpdate(_key: string, message: string): void;
111
+ protected showProgressEnd(_key: string, message?: string): void;
112
+ pause(): void;
113
+ resume(): void;
114
+ abstract prompt<T extends InquirerAnswers>(questions: InquirerQuestionCollection<T>, options?: PromptOptions): Promise<T>;
115
+ confirm(message: string, defaultValue?: boolean, options?: PromptOptions): Promise<boolean>;
116
+ select<T>(message: string, choices: Array<{
117
+ name: string;
118
+ value: T;
119
+ }>, defaultValue?: T, options?: PromptOptions): Promise<T>;
120
+ }
65
121
  export declare let logger: Logger;
66
122
  /**
67
123
  * Set a custom logger implementation (e.g., CLILogger with spinners)
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAKA,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC3C,KAAK,0BAA0B,CAAC,CAAC,IAAI,GAAG,CAAC;AAEzC,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEvE,MAAM,WAAW,aAAa;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAMD,iDAAiD;AACjD,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,oCAAoC;AACpC,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,kCAAkC;AAClC,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACrB;AAOD,qEAAqE;AACrE,eAAO,MAAM,gBAAgB,QAAO,MAiBnC,CAAC;AAOF;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAWpH;AAED;;;GAGG;AACH,MAAM,WAAW,MAAM;IACnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACnD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjD,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,IAAI,IAAI,CAAC;IAEf,MAAM,CAAC,CAAC,SAAS,eAAe,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACjH,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,MAAM,CAAC,CAAC,EACJ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,CAAC,EAC1C,YAAY,CAAC,EAAE,CAAC,EAChB,OAAO,CAAC,EAAE,aAAa,GACxB,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB;AA8KD,eAAO,IAAI,MAAM,EAAE,MAA4B,CAAC;AAEhD;;GAEG;AACH,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEjD"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,EAAE,CAezE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAwFzD;AAED,wBAAgB,YAAY,IAAI,OAAO,CAyDtC"}
1
+ {"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../src/program.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2BzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,EAAE,CAMzE;AAYD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAgFzD;AAED,wBAAgB,YAAY,IAAI,OAAO,CAyDtC"}
@@ -1 +1 @@
1
- {"version":3,"file":"programBase.d.ts","sourceRoot":"","sources":["../src/programBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,eAAO,MAAM,OAAO,KAAsB,CAAC;AAkC3C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAa3D;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CA4B1C"}
1
+ {"version":3,"file":"programBase.d.ts","sourceRoot":"","sources":["../src/programBase.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,eAAO,MAAM,OAAO,KAAsB,CAAC;AAkC3C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAa3D;AAED,wBAAgB,gBAAgB,IAAI,OAAO,CAwB1C"}
@@ -0,0 +1,9 @@
1
+ interface ManagedNodeUpdate {
2
+ currentVersion: string;
3
+ latestVersion: string | null;
4
+ status: "up-to-date" | "update-available" | "check-failed";
5
+ }
6
+ /** Check only the runtime installed by our installers; other Node installations belong to the user. */
7
+ export declare function getManagedNodeUpdate(): Promise<ManagedNodeUpdate | null>;
8
+ export {};
9
+ //# sourceMappingURL=node-runtime.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"node-runtime.d.ts","sourceRoot":"","sources":["../../src/services/node-runtime.ts"],"names":[],"mappings":"AAKA,UAAU,iBAAiB;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,YAAY,GAAG,kBAAkB,GAAG,cAAc,CAAC;CAC9D;AAED,uGAAuG;AACvG,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA+B9E"}
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-login.d.ts","sourceRoot":"","sources":["../../src/services/oauth-login.ts"],"names":[],"mappings":"AAOA,OAAO,EAA8C,WAAW,EAAE,MAAM,QAAQ,CAAC;AAKjF;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AA4GD;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAiBvG;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,2BAA2B,EACvC,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GAC1C,OAAO,CAAC,kBAAkB,CAAC,CA8C7B;AA2HD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CA+CpF"}
1
+ {"version":3,"file":"oauth-login.d.ts","sourceRoot":"","sources":["../../src/services/oauth-login.ts"],"names":[],"mappings":"AAOA,OAAO,EAA8C,WAAW,EAAE,MAAM,QAAQ,CAAC;AAKjF;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AA4GD;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAiBvG;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,2BAA2B,EACvC,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,OAAO,CAAA;CAAE,GAC1C,OAAO,CAAC,kBAAkB,CAAC,CA8C7B;AA2HD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CA6CpF"}
@@ -96,7 +96,8 @@ export declare class SaveProcessor extends Emitter<SaveProcessorEvents> {
96
96
  private getStagedChanges;
97
97
  private getUnstagedChanges;
98
98
  private detectUnstagedRenames;
99
- private getHeadAnvilYaml;
99
+ private getCommittedAnvilYaml;
100
+ private getAnvilYamlUpdates;
100
101
  private processBatchedChanges;
101
102
  private logSaveResult;
102
103
  private sendSavesToAnvil;
@@ -105,10 +106,7 @@ export declare class SaveProcessor extends Emitter<SaveProcessorEvents> {
105
106
  private handleConflict;
106
107
  private getConflictDiagnosticInfo;
107
108
  private handleSuccess;
108
- rerouteChanges(changes: FileChange[]): Promise<{
109
- newSaveArray: Array<[any[], any]>;
110
- newFilePaths: string[];
111
- }>;
109
+ private rerouteChanges;
112
110
  }
113
111
  export {};
114
112
  //# sourceMappingURL=SaveProcessor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SaveProcessor.d.ts","sourceRoot":"","sources":["../../src/watch/SaveProcessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SaveProcessor.d.ts","sourceRoot":"","sources":["../../src/watch/SaveProcessor.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,7 @@ export interface SyncManagerConfig extends Pick<ReportingOptions, "logger"> {
18
18
  username?: string;
19
19
  gitService: GitService;
20
20
  editorYaml: EditorYamlManager;
21
+ stagedOnly?: boolean;
21
22
  getAuthToken: () => string;
22
23
  setAuthToken: (token: string) => void;
23
24
  getCurrentBranch: () => string;
@@ -51,6 +52,7 @@ export declare class SyncManager extends Emitter<SyncManagerEvents> {
51
52
  private fetchAndMoveCleanTreeToAnvilHead;
52
53
  private withFetchedAnvilRef;
53
54
  private resetToFetchedAnvilRef;
55
+ private prepareAnvilYamlRebase;
54
56
  private isCleanForFastForward;
55
57
  private deleteFilesRemovedOnAnvilLocally;
56
58
  private discardFormattingOnlyYamlChanges;
@@ -1 +1 @@
1
- {"version":3,"file":"SyncManager.d.ts","sourceRoot":"","sources":["../../src/watch/SyncManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAA6B,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhF,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAQH,KAAK,UAAU,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACrE;AAED,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,0BAA0B,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,qBAAa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,SAAS,CAAuC;gBAE5C,MAAM,EAAE,iBAAiB;IAOrC;;;;;;;OAOG;IACG,iBAAiB,CACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAChC,OAAO,CAAC;QAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;YAOzD,wBAAwB;IAgDtC;;;OAGG;IACG,sBAAsB,CAAC,sBAAsB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAO9E,gCAAgC;YA2BhC,mBAAmB;YAgBnB,sBAAsB;IAapC,OAAO,CAAC,qBAAqB;YAYf,gCAAgC;YAoBhC,gCAAgC;CAkGjD"}
1
+ {"version":3,"file":"SyncManager.d.ts","sourceRoot":"","sources":["../../src/watch/SyncManager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAA6B,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhF,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAQH,KAAK,UAAU,EAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,EAAE,CAAC;IACnB,gBAAgB,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CACrE;AAED,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,MAAM,CAAC;IAC1B,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,0BAA0B,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAyDD,qBAAa,WAAY,SAAQ,OAAO,CAAC,iBAAiB,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,SAAS,CAAuC;gBAE5C,MAAM,EAAE,iBAAiB;IAOrC;;;;;;;OAOG;IACG,iBAAiB,CACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GAChC,OAAO,CAAC;QAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC;QAAC,SAAS,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;YAOzD,wBAAwB;IAgDtC;;;OAGG;IACG,sBAAsB,CAAC,sBAAsB,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAO9E,gCAAgC;YA2BhC,mBAAmB;YAgBnB,sBAAsB;YAiCtB,sBAAsB;IAkBpC,OAAO,CAAC,qBAAqB;YAYf,gCAAgC;YAoBhC,gCAAgC;CAkGjD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@anvil-works/anvil-cli",
3
- "version": "0.8.0",
3
+ "version": "0.9.0-canary.0",
4
4
  "description": "CLI tool for developing Anvil apps locally",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/api.d.ts",
@@ -3,6 +3,16 @@ REM Source of truth: @anvil-works/anvil-cli (scripts/install/install.cmd).
3
3
  REM This script is synced into anvil website static install endpoints; do not edit the synced copy directly.
4
4
  setlocal
5
5
 
6
+ set "NODE_OPTION="
7
+ if "%~1"=="--install-node" (
8
+ set "NODE_OPTION=-InstallNode"
9
+ shift
10
+ )
11
+ if not "%~1"=="" (
12
+ echo Error: supported option is --install-node.
13
+ exit /b 1
14
+ )
15
+
6
16
  set "SCRIPT_URL=%ANVIL_INSTALL_URL%"
7
17
  if not defined SCRIPT_URL set "SCRIPT_URL=https://anvil.works/install-cli.ps1"
8
18
  set "SCRIPT_PATH=%TEMP%\anvil-install-%RANDOM%%RANDOM%.ps1"
@@ -26,7 +36,7 @@ if errorlevel 1 (
26
36
  exit /b 1
27
37
  )
28
38
 
29
- powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_PATH%"
39
+ powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_PATH%" %NODE_OPTION%
30
40
  set "EXIT_CODE=%ERRORLEVEL%"
31
41
 
32
42
  del /q "%SCRIPT_PATH%" >nul 2>&1
@@ -1,12 +1,15 @@
1
1
  # Source of truth: @anvil-works/anvil-cli (scripts/install/install.ps1).
2
2
  # This script is synced into anvil website static install endpoints; do not edit the synced copy directly.
3
+ param([switch]$InstallNode)
4
+
3
5
  $ErrorActionPreference = 'Stop'
4
6
  Set-StrictMode -Version Latest
5
7
 
6
8
  $AnvilHome = if ($env:ANVIL_HOME) { $env:ANVIL_HOME } else { Join-Path $env:USERPROFILE '.anvil-cli' }
7
- $NodeDir = Join-Path $AnvilHome 'node-v20'
9
+ $AnvilHome = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($AnvilHome)
10
+ $NodeDir = Join-Path $AnvilHome 'node-v24'
11
+ $LegacyNodeDir = Join-Path $AnvilHome 'node-v20'
8
12
  $NpmPrefix = Join-Path $AnvilHome 'npm-global'
9
- $MinTargetMajor = 20
10
13
 
11
14
  function Write-Info([string] $Message) {
12
15
  Write-Host $Message
@@ -29,41 +32,34 @@ function Get-PlatformArch {
29
32
  return 'x64'
30
33
  }
31
34
 
32
- function Get-NodeMajorFromPath {
33
- if (-not (Get-Command node -ErrorAction SilentlyContinue)) {
34
- return $null
35
+ function Get-NodeVersion([string] $Command) {
36
+ try {
37
+ return ([string](& $Command -v 2>$null)).Trim()
35
38
  }
36
-
37
- $version = (& node -v).Trim()
38
- if ($version -match '^v(\d+)') {
39
- return [int]$Matches[1]
39
+ catch {
40
+ return ''
40
41
  }
41
-
42
- return $null
43
42
  }
44
43
 
45
44
  function Update-CurrentPath {
46
- $env:Path = "$NpmPrefix;$NodeDir;$env:Path"
45
+ if ($UseManagedNode) {
46
+ $env:Path = "$NodeDir;$env:Path"
47
+ }
48
+ $env:Path = "$NpmPrefix;$env:Path"
47
49
  }
48
50
 
49
- function Add-UserPathSegment([string] $Segment) {
51
+ function Update-UserPath {
50
52
  $currentUserPath = [Environment]::GetEnvironmentVariable('Path', 'User')
51
- if (-not $currentUserPath) {
52
- [Environment]::SetEnvironmentVariable('Path', $Segment, 'User')
53
- return
54
- }
55
-
56
- $parts = $currentUserPath -split ';' | Where-Object { $_ -ne '' }
57
- if ($parts -contains $Segment) {
58
- return
53
+ $parts = @($currentUserPath -split ';' | Where-Object { $_ -and $_ -notin @($LegacyNodeDir, $NodeDir, $NpmPrefix) })
54
+ if ($UseManagedNode) {
55
+ $parts = @($NodeDir) + $parts
59
56
  }
60
-
61
- [Environment]::SetEnvironmentVariable('Path', "$Segment;$currentUserPath", 'User')
57
+ [Environment]::SetEnvironmentVariable('Path', ((@($NpmPrefix) + $parts) -join ';'), 'User')
62
58
  }
63
59
 
64
- function Install-NodeV20 {
60
+ function Install-NodeV24 {
65
61
  $arch = Get-PlatformArch
66
- $baseUrl = 'https://nodejs.org/dist/latest-v20.x'
62
+ $baseUrl = 'https://nodejs.org/dist/latest-v24.x'
67
63
  $sumsUrl = "$baseUrl/SHASUMS256.txt"
68
64
 
69
65
  $tmpRoot = Join-Path ([System.IO.Path]::GetTempPath()) ("anvil-install-" + [System.Guid]::NewGuid().ToString('N'))
@@ -73,7 +69,7 @@ function Install-NodeV20 {
73
69
  $sumsPath = Join-Path $tmpRoot 'SHASUMS256.txt'
74
70
  Invoke-WebRequest -UseBasicParsing -Uri $sumsUrl -OutFile $sumsPath
75
71
 
76
- $pattern = "node-v20\.[0-9]+\.[0-9]+-win-$arch\.zip$"
72
+ $pattern = "node-v24\.[0-9]+\.[0-9]+-win-$arch\.zip$"
77
73
  $archiveLine = Get-Content -LiteralPath $sumsPath | Where-Object { $_ -match $pattern } | Select-Object -First 1
78
74
  if (-not $archiveLine) {
79
75
  Fail "Could not resolve Node.js archive for win-$arch"
@@ -81,10 +77,16 @@ function Install-NodeV20 {
81
77
 
82
78
  $tokens = $archiveLine -split '\s+'
83
79
  $archiveName = $tokens[-1]
80
+ $latestVersion = ($archiveName -split '-')[1]
81
+ $nodeExe = Join-Path $NodeDir 'node.exe'
82
+ if ((Test-Path -LiteralPath $nodeExe) -and (Get-NodeVersion $nodeExe) -eq $latestVersion) {
83
+ Write-Info "Using current bundled Node.js $latestVersion"
84
+ return
85
+ }
84
86
  $archivePath = Join-Path $tmpRoot $archiveName
85
87
  $archiveUrl = "$baseUrl/$archiveName"
86
88
 
87
- Write-Info "Installing Node.js v20 for win-$arch..."
89
+ Write-Info "Installing Node.js $latestVersion for win-$arch..."
88
90
  Invoke-WebRequest -UseBasicParsing -Uri $archiveUrl -OutFile $archivePath
89
91
 
90
92
  $expectedHash = ($tokens | Where-Object { $_ -match '^[A-Fa-f0-9]{64}$' } | Select-Object -First 1)
@@ -95,16 +97,15 @@ function Install-NodeV20 {
95
97
  }
96
98
  }
97
99
 
98
- if (Test-Path -LiteralPath $NodeDir) {
99
- Remove-Item -LiteralPath $NodeDir -Recurse -Force
100
- }
101
-
102
100
  Expand-Archive -LiteralPath $archivePath -DestinationPath $tmpRoot -Force
103
- $expandedRoot = Get-ChildItem -LiteralPath $tmpRoot -Directory | Where-Object { $_.Name -like 'node-v20.*-win-*' } | Select-Object -First 1
101
+ $expandedRoot = Get-ChildItem -LiteralPath $tmpRoot -Directory | Where-Object { $_.Name -like 'node-v24.*-win-*' } | Select-Object -First 1
104
102
  if (-not $expandedRoot) {
105
103
  Fail 'Failed to locate extracted Node.js directory'
106
104
  }
107
105
 
106
+ if (Test-Path -LiteralPath $NodeDir) {
107
+ Remove-Item -LiteralPath $NodeDir -Recurse -Force
108
+ }
108
109
  Move-Item -LiteralPath $expandedRoot.FullName -Destination $NodeDir
109
110
  }
110
111
  finally {
@@ -115,24 +116,36 @@ function Install-NodeV20 {
115
116
  }
116
117
 
117
118
  function Ensure-Node {
118
- $major = Get-NodeMajorFromPath
119
- if ($major -and $major -ge $MinTargetMajor) {
120
- $version = (& node -v).Trim()
119
+ $nodeCommand = Get-Command node -ErrorAction SilentlyContinue
120
+ if ($nodeCommand -and $nodeCommand.CommandType -eq 'Application' -and (Split-Path -Parent $nodeCommand.Source) -in @($LegacyNodeDir, $NodeDir)) {
121
+ Install-NodeV24
122
+ return $true
123
+ }
124
+
125
+ $version = if ($nodeCommand) { Get-NodeVersion 'node' } else { '' }
126
+ $major = if ($version -match '^v(\d+)') { [int]$Matches[1] } else { $null }
127
+ if ($major -in @(22, 24, 26)) {
121
128
  Write-Info "Using existing Node.js $version"
122
- return
129
+ return $false
123
130
  }
124
131
 
125
- if ($major) {
126
- Write-Info "Existing Node.js major v$major is too old; installing Node.js v20 user-local"
132
+ if (-not $InstallNode) {
133
+ $found = if ($version) { "found Node.js $version" } elseif ($nodeCommand) { 'Node.js could not report its version' } else { 'Node.js was not found' }
134
+ Fail "Anvil CLI requires Node.js 22, 24 or 26 LTS; $found.
135
+ Install/update Node.js yourself: https://nodejs.org/en/download
136
+ Or install a private Node.js 24 copy and add it to PATH:
137
+ PowerShell: & ([scriptblock]::Create((irm https://anvil.works/install-cli.ps1))) -InstallNode
138
+ CMD: curl -fsSL https://anvil.works/install-cli.cmd -o install.cmd && install.cmd --install-node && del install.cmd"
127
139
  }
128
140
 
129
141
  Ensure-Directory -Path $AnvilHome
130
- Install-NodeV20
142
+ Install-NodeV24
143
+ return $true
131
144
  }
132
145
 
133
146
  function Ensure-Npm {
134
147
  $npmCmd = Join-Path $NodeDir 'npm.cmd'
135
- if (Test-Path -LiteralPath $npmCmd) {
148
+ if ($UseManagedNode -and (Test-Path -LiteralPath $npmCmd)) {
136
149
  return $npmCmd
137
150
  }
138
151
 
@@ -191,11 +204,10 @@ function Main {
191
204
  Ensure-Directory -Path $AnvilHome
192
205
  Ensure-Directory -Path $NpmPrefix
193
206
 
194
- Ensure-Node
207
+ $UseManagedNode = Ensure-Node
195
208
 
196
209
  Update-CurrentPath
197
- Add-UserPathSegment -Segment $NodeDir
198
- Add-UserPathSegment -Segment $NpmPrefix
210
+ Update-UserPath
199
211
 
200
212
  Warn-IfMissingGit
201
213
 
@@ -217,6 +229,10 @@ function Main {
217
229
  Fail "anvil installed but command verification failed: $($_.Exception.Message)"
218
230
  }
219
231
 
232
+ if (Test-Path -LiteralPath $LegacyNodeDir) {
233
+ Remove-Item -LiteralPath $LegacyNodeDir -Recurse -Force
234
+ }
235
+
220
236
  Write-Info ''
221
237
  Write-Info "anvil-cli installed successfully (v$version)"
222
238
  Write-Info "Next steps: run 'anvil configure' or 'anvil checkout'"