@hydranium/cli 1.0.0-next.189 → 1.0.0-next.192
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/lib/commands/ast-ground-truth-args.js +5 -5
- package/lib/commands/ast-ground-truth-args.js.map +1 -1
- package/lib/commands/harness-args.d.ts +19 -35
- package/lib/commands/harness-args.d.ts.map +1 -1
- package/lib/commands/harness-args.js +38 -16
- package/lib/commands/harness-args.js.map +1 -1
- package/lib/commands/headless-harness.d.ts +14 -15
- package/lib/commands/headless-harness.d.ts.map +1 -1
- package/lib/commands/headless-harness.js +8 -8
- package/lib/commands/headless-harness.js.map +1 -1
- package/lib/commands/lint-grammar-args.js +5 -5
- package/lib/commands/lint-grammar-args.js.map +1 -1
- package/lib/commands/measure-memory-args.d.ts.map +1 -1
- package/lib/commands/measure-memory-args.js +11 -4
- package/lib/commands/measure-memory-args.js.map +1 -1
- package/lib/commands/model-docs-args.js +5 -5
- package/lib/commands/model-docs-args.js.map +1 -1
- package/lib/commands/projects-args.d.ts.map +1 -1
- package/lib/commands/projects-args.js +5 -5
- package/lib/commands/projects-args.js.map +1 -1
- package/lib/commands/projects.d.ts +3 -4
- package/lib/commands/projects.d.ts.map +1 -1
- package/lib/commands/projects.js +2 -2
- package/lib/commands/projects.js.map +1 -1
- package/lib/commands/query-args.d.ts.map +1 -1
- package/lib/commands/query-args.js +5 -5
- package/lib/commands/query-args.js.map +1 -1
- package/lib/commands/query.d.ts +3 -4
- package/lib/commands/query.d.ts.map +1 -1
- package/lib/commands/query.js +2 -2
- package/lib/commands/query.js.map +1 -1
- package/lib/commands/reflect-args.js +5 -5
- package/lib/commands/reflect-args.js.map +1 -1
- package/lib/commands/save-args.d.ts.map +1 -1
- package/lib/commands/save-args.js +6 -4
- package/lib/commands/save-args.js.map +1 -1
- package/lib/commands/save.d.ts +3 -4
- package/lib/commands/save.d.ts.map +1 -1
- package/lib/commands/save.js +2 -2
- package/lib/commands/save.js.map +1 -1
- package/lib/commands/validate-args.js +5 -5
- package/lib/commands/validate-args.js.map +1 -1
- package/lib/commands/watch-args.d.ts.map +1 -1
- package/lib/commands/watch-args.js +6 -4
- package/lib/commands/watch-args.js.map +1 -1
- package/lib/commands/watch.d.ts +3 -4
- package/lib/commands/watch.d.ts.map +1 -1
- package/lib/commands/watch.js +2 -2
- package/lib/commands/watch.js.map +1 -1
- package/lib/log-level.d.ts +21 -11
- package/lib/log-level.d.ts.map +1 -1
- package/lib/log-level.js +25 -14
- package/lib/log-level.js.map +1 -1
- package/package.json +9 -9
- package/src/commands/ast-ground-truth-args.ts +7 -7
- package/src/commands/harness-args.ts +42 -19
- package/src/commands/headless-harness.ts +15 -20
- package/src/commands/lint-grammar-args.ts +7 -7
- package/src/commands/measure-memory-args.ts +14 -6
- package/src/commands/model-docs-args.ts +7 -7
- package/src/commands/projects-args.ts +5 -4
- package/src/commands/projects.ts +4 -6
- package/src/commands/query-args.ts +5 -4
- package/src/commands/query.ts +4 -6
- package/src/commands/reflect-args.ts +7 -7
- package/src/commands/save-args.ts +6 -3
- package/src/commands/save.ts +4 -6
- package/src/commands/validate-args.ts +7 -7
- package/src/commands/watch-args.ts +6 -3
- package/src/commands/watch.ts +4 -6
- package/src/log-level.ts +42 -14
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import { runAstGroundTruth } from './ast-ground-truth.js';
|
|
10
|
-
import { exitWithUsage, helpRequested,
|
|
10
|
+
import { exitWithUsage, helpRequested, LOG_VALUE_FLAGS, logHelpLines, logOptions, parseHarnessArgs, printHelp, SERVICES_FLAG } from './harness-args.js';
|
|
11
11
|
import { OUT_FILE_FLAG } from './headless-harness.js';
|
|
12
|
-
const VALUE_FLAGS = [OUT_FILE_FLAG,
|
|
12
|
+
const VALUE_FLAGS = [OUT_FILE_FLAG, ...LOG_VALUE_FLAGS];
|
|
13
13
|
/**
|
|
14
14
|
* Every flag `ast-ground-truth` accepts, derived from the sets the parser is
|
|
15
15
|
* handed so the list cannot claim a flag the parser would reject. `--services`
|
|
@@ -20,7 +20,7 @@ export const AST_GROUND_TRUTH_FLAGS = [SERVICES_FLAG, ...VALUE_FLAGS];
|
|
|
20
20
|
export const AST_GROUND_TRUTH_VALUE_FLAGS = AST_GROUND_TRUTH_FLAGS;
|
|
21
21
|
/** The `--help` text, as data, held to {@link AST_GROUND_TRUTH_FLAGS} by a test. */
|
|
22
22
|
export const AST_GROUND_TRUTH_HELP = [
|
|
23
|
-
'Usage: hydranium-cli ast-ground-truth --services <module> <workspace> [--out-file <file>] [--log-level <lvl>]',
|
|
23
|
+
'Usage: hydranium-cli ast-ground-truth --services <module> <workspace> [--out-file <file>] [--log-level <lvl>] [--log-file <file>] [--log-file-level <lvl>]',
|
|
24
24
|
'',
|
|
25
25
|
"Tally a workspace's live-model AST nodes by `$type` — the ground truth that",
|
|
26
26
|
'`analyze-heap --validate <gt.json>` checks a heap snapshot against. `<module>`',
|
|
@@ -31,11 +31,11 @@ export const AST_GROUND_TRUTH_HELP = [
|
|
|
31
31
|
' --services <module> ESM module exporting `createServices(): { shared }` (required).',
|
|
32
32
|
' <workspace> Workspace root (path or file URI) to build (required).',
|
|
33
33
|
' --out-file <file> Write the JSON to this file instead of stdout.',
|
|
34
|
-
|
|
34
|
+
...logHelpLines(22)
|
|
35
35
|
];
|
|
36
36
|
export function parseAstGroundTruthArgs(args, onError = exitWithUsage) {
|
|
37
37
|
const { servicesModule, workspace, options } = parseHarnessArgs(args, 'ast-ground-truth', VALUE_FLAGS, [], { onError });
|
|
38
|
-
return { servicesModule, workspace, outFile: options[OUT_FILE_FLAG],
|
|
38
|
+
return { servicesModule, workspace, outFile: options[OUT_FILE_FLAG], ...logOptions(options) };
|
|
39
39
|
}
|
|
40
40
|
export function runAstGroundTruthCommand(args) {
|
|
41
41
|
if (helpRequested(args, AST_GROUND_TRUTH_VALUE_FLAGS)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-ground-truth-args.js","sourceRoot":"","sources":["../../src/commands/ast-ground-truth-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,iBAAiB,EAAqC,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EACJ,aAAa,EACb,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"ast-ground-truth-args.js","sourceRoot":"","sources":["../../src/commands/ast-ground-truth-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,iBAAiB,EAAqC,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EACJ,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,aAAa,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,GAAG,eAAe,CAAU,CAAC;AAEjE;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAsB,CAAC,aAAa,EAAE,GAAG,WAAW,CAAC,CAAC;AAEzF,oFAAoF;AACpF,MAAM,CAAC,MAAM,4BAA4B,GAAsB,sBAAsB,CAAC;AAEtF,oFAAoF;AACpF,MAAM,CAAC,MAAM,qBAAqB,GAAsB;IACrD,4JAA4J;IAC5J,EAAE;IACF,6EAA6E;IAC7E,gFAAgF;IAChF,oEAAoE;IACpE,0EAA0E;IAC1E,EAAE;IACF,UAAU;IACV,yFAAyF;IACzF,gFAAgF;IAChF,wEAAwE;IACxE,GAAG,YAAY,CAAC,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,IAAc,EAAE,OAAO,GAAe,aAAa;IACxF,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACxH,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;AACjG,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAAc;IACpD,IAAI,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,EAAE,CAAC;QACrD,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,iBAAiB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -6,30 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
|
|
10
|
-
* The argv machinery the subcommands share, and the error vocabulary they all
|
|
11
|
-
* speak.
|
|
12
|
-
*
|
|
13
|
-
* Its own module rather than functions in the CLI entry point, because the entry
|
|
14
|
-
* point runs `main()` on import: a test that wants to read an argv the way a
|
|
15
|
-
* command does would otherwise have to spawn the whole binary, so flag handling
|
|
16
|
-
* and exit codes could only be covered through a subprocess.
|
|
17
|
-
*
|
|
18
|
-
* The messages here are a contract — scripts and CI steps match on them — so
|
|
19
|
-
* changing one is a breaking change for a caller nobody in this repo can see.
|
|
20
|
-
*
|
|
21
|
-
* Every parser takes an `onError` defaulting to report-and-exit, which is what a
|
|
22
|
-
* command line wants; a caller that would rather handle the problem passes its
|
|
23
|
-
* own and the parser hands control to it instead of ending the process.
|
|
24
|
-
*
|
|
25
|
-
* Each subcommand lives in a sibling `<name>-args` module exporting three things
|
|
26
|
-
* a test can hold against each other: its flag list, its `--help` text as data,
|
|
27
|
-
* and the parser that turns an argv into the runner's options. Help that drifts
|
|
28
|
-
* from the parser is worse than none — it reads as authoritative, so a flag
|
|
29
|
-
* missing from it is a capability nobody finds, and one it describes but the
|
|
30
|
-
* parser rejects is an invocation that fails for no visible reason.
|
|
31
|
-
*/
|
|
32
|
-
import type { LogThreshold } from '@hydranium/protocol';
|
|
9
|
+
import { type LogOptions } from '../log-level.js';
|
|
33
10
|
/**
|
|
34
11
|
* How a parser reports a usage problem. It never returns, so a parser can treat
|
|
35
12
|
* the call as a dead end and keep narrowing the value it was about to reject.
|
|
@@ -55,27 +32,35 @@ export declare const SERVICES_FLAG = "--services";
|
|
|
55
32
|
* on which command a caller happened to reach for.
|
|
56
33
|
*/
|
|
57
34
|
export declare const LOG_LEVEL_FLAG = "--log-level";
|
|
35
|
+
export declare const LOG_FILE_FLAG = "--log-file";
|
|
36
|
+
export declare const LOG_FILE_LEVEL_FLAG = "--log-file-level";
|
|
37
|
+
/** The log flags every subcommand takes, read by {@link logOptions}. */
|
|
38
|
+
export declare const LOG_VALUE_FLAGS: readonly ["--log-level", "--log-file", "--log-file-level"];
|
|
58
39
|
/** The value flags {@link parseServerSpawnOptions} consumes itself. */
|
|
59
40
|
export declare const SERVER_SPAWN_VALUE_FLAGS: readonly string[];
|
|
60
41
|
/**
|
|
61
|
-
* The `--help`
|
|
42
|
+
* The `--help` lines every subcommand describes {@link LOG_VALUE_FLAGS} with.
|
|
62
43
|
*
|
|
63
44
|
* Shared text, per-command padding: `command-args.test.ts` compares the flags a
|
|
64
45
|
* help block DESCRIBES against the flags the parser accepts, and it recognises a
|
|
65
|
-
* description by the two-space indent — so
|
|
46
|
+
* description by the two-space indent — so each line has to be a real option entry
|
|
66
47
|
* in each block, and the column each block aligns its descriptions at is the
|
|
67
|
-
* block's own.
|
|
48
|
+
* block's own. A flag too wide for that column takes its description on the
|
|
49
|
+
* next line, at the column.
|
|
68
50
|
*/
|
|
69
|
-
export declare function
|
|
51
|
+
export declare function logHelpLines(padTo: number, head?: string): string[];
|
|
70
52
|
/**
|
|
71
|
-
* Narrow
|
|
72
|
-
*
|
|
53
|
+
* Narrow the raw {@link LOG_VALUE_FLAGS} values a parser collected, leaving
|
|
54
|
+
* absent flags absent.
|
|
55
|
+
*
|
|
56
|
+
* `--log-file` resolves against the caller's directory: the child may run
|
|
57
|
+
* elsewhere (`--cwd`), and a relative path would land the log there.
|
|
73
58
|
*
|
|
74
59
|
* Throws rather than reaching `onError`, matching {@link parseServerSpawnOptions}:
|
|
75
60
|
* the level vocabulary belongs to the protocol package, which reports it, and the
|
|
76
61
|
* entry point's catch turns that into the same message-and-exit.
|
|
77
62
|
*/
|
|
78
|
-
export declare function
|
|
63
|
+
export declare function logOptions(options: Readonly<Record<string, string | undefined>>): LogOptions;
|
|
79
64
|
/**
|
|
80
65
|
* Whether the argv asks for the command's help rather than describing a run.
|
|
81
66
|
*
|
|
@@ -167,20 +152,19 @@ export declare function numericOption(value: string | undefined, flag: string, o
|
|
|
167
152
|
*/
|
|
168
153
|
export declare function parseFlagOptions(extra: string[], commandName: string, recognised: readonly string[], onError?: UsageError): Record<string, string | undefined>;
|
|
169
154
|
/** What {@link parseServerSpawnOptions} recovered from an argv. */
|
|
170
|
-
export interface SpawnOptions {
|
|
155
|
+
export interface SpawnOptions extends LogOptions {
|
|
171
156
|
serverCommand: string;
|
|
172
157
|
serverArgs: string[];
|
|
173
158
|
cwd?: string;
|
|
174
|
-
logLevel?: LogThreshold;
|
|
175
159
|
/** The tokens this parser did not claim, for the subcommand's own options. */
|
|
176
160
|
extra: string[];
|
|
177
161
|
}
|
|
178
162
|
/**
|
|
179
163
|
* Shared option parser for subcommands that spawn a data-server child. Consumes
|
|
180
|
-
* `--server` / `--cwd` /
|
|
164
|
+
* `--server` / `--cwd` / the {@link LOG_VALUE_FLAGS} and returns the surviving tokens as
|
|
181
165
|
* `extra` for {@link parseFlagOptions} to finish.
|
|
182
166
|
*
|
|
183
|
-
* An unrecognised
|
|
167
|
+
* An unrecognised log level value throws rather than reaching `onError`: the
|
|
184
168
|
* level vocabulary belongs to the protocol package, which reports it, and the
|
|
185
169
|
* entry point's catch turns that into the same message-and-exit.
|
|
186
170
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harness-args.d.ts","sourceRoot":"","sources":["../../src/commands/harness-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;
|
|
1
|
+
{"version":3,"file":"harness-args.d.ts","sourceRoot":"","sources":["../../src/commands/harness-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,30 +33,52 @@ export const SERVICES_FLAG = '--services';
|
|
|
33
33
|
* on which command a caller happened to reach for.
|
|
34
34
|
*/
|
|
35
35
|
export const LOG_LEVEL_FLAG = '--log-level';
|
|
36
|
+
export const LOG_FILE_FLAG = '--log-file';
|
|
37
|
+
export const LOG_FILE_LEVEL_FLAG = '--log-file-level';
|
|
38
|
+
/** The log flags every subcommand takes, read by {@link logOptions}. */
|
|
39
|
+
export const LOG_VALUE_FLAGS = [LOG_LEVEL_FLAG, LOG_FILE_FLAG, LOG_FILE_LEVEL_FLAG];
|
|
36
40
|
/** The value flags {@link parseServerSpawnOptions} consumes itself. */
|
|
37
|
-
export const SERVER_SPAWN_VALUE_FLAGS = ['--server', '--cwd',
|
|
41
|
+
export const SERVER_SPAWN_VALUE_FLAGS = ['--server', '--cwd', ...LOG_VALUE_FLAGS];
|
|
38
42
|
/**
|
|
39
|
-
* The `--help`
|
|
43
|
+
* The `--help` lines every subcommand describes {@link LOG_VALUE_FLAGS} with.
|
|
40
44
|
*
|
|
41
45
|
* Shared text, per-command padding: `command-args.test.ts` compares the flags a
|
|
42
46
|
* help block DESCRIBES against the flags the parser accepts, and it recognises a
|
|
43
|
-
* description by the two-space indent — so
|
|
47
|
+
* description by the two-space indent — so each line has to be a real option entry
|
|
44
48
|
* in each block, and the column each block aligns its descriptions at is the
|
|
45
|
-
* block's own.
|
|
49
|
+
* block's own. A flag too wide for that column takes its description on the
|
|
50
|
+
* next line, at the column.
|
|
46
51
|
*/
|
|
47
|
-
export function
|
|
48
|
-
|
|
52
|
+
export function logHelpLines(padTo, head = 'the head this boots') {
|
|
53
|
+
const line = (flag, text) => flag.length < padTo - 1 ? [` ${flag.padEnd(padTo)}${text}`] : [` ${flag}`, `${' '.repeat(padTo + 2)}${text}`];
|
|
54
|
+
return [
|
|
55
|
+
line(`${LOG_LEVEL_FLAG} <lvl>`, `Log threshold for ${head} (off|error|warn|info|debug|trace).`),
|
|
56
|
+
line(`${LOG_FILE_FLAG} <file>`, `Also write ${head}'s log to <file>; {workspace} expands to the workspace.`),
|
|
57
|
+
line(`${LOG_FILE_LEVEL_FLAG} <lvl>`, `Threshold for that file, which the log-level setting does not change.`)
|
|
58
|
+
].flat();
|
|
49
59
|
}
|
|
50
60
|
/**
|
|
51
|
-
* Narrow
|
|
52
|
-
*
|
|
61
|
+
* Narrow the raw {@link LOG_VALUE_FLAGS} values a parser collected, leaving
|
|
62
|
+
* absent flags absent.
|
|
63
|
+
*
|
|
64
|
+
* `--log-file` resolves against the caller's directory: the child may run
|
|
65
|
+
* elsewhere (`--cwd`), and a relative path would land the log there.
|
|
53
66
|
*
|
|
54
67
|
* Throws rather than reaching `onError`, matching {@link parseServerSpawnOptions}:
|
|
55
68
|
* the level vocabulary belongs to the protocol package, which reports it, and the
|
|
56
69
|
* entry point's catch turns that into the same message-and-exit.
|
|
57
70
|
*/
|
|
58
|
-
export function
|
|
59
|
-
|
|
71
|
+
export function logOptions(options) {
|
|
72
|
+
const level = (flag) => {
|
|
73
|
+
const value = options[flag];
|
|
74
|
+
return value === undefined ? undefined : parseLogLevelOption(value, flag);
|
|
75
|
+
};
|
|
76
|
+
const logFile = options[LOG_FILE_FLAG];
|
|
77
|
+
return {
|
|
78
|
+
logLevel: level(LOG_LEVEL_FLAG),
|
|
79
|
+
logFile: logFile === undefined ? undefined : path.resolve(logFile),
|
|
80
|
+
logFileLevel: level(LOG_FILE_LEVEL_FLAG)
|
|
81
|
+
};
|
|
60
82
|
}
|
|
61
83
|
/**
|
|
62
84
|
* Whether the argv asks for the command's help rather than describing a run.
|
|
@@ -271,10 +293,10 @@ function isRelativePathToken(token, isCommand) {
|
|
|
271
293
|
}
|
|
272
294
|
/**
|
|
273
295
|
* Shared option parser for subcommands that spawn a data-server child. Consumes
|
|
274
|
-
* `--server` / `--cwd` /
|
|
296
|
+
* `--server` / `--cwd` / the {@link LOG_VALUE_FLAGS} and returns the surviving tokens as
|
|
275
297
|
* `extra` for {@link parseFlagOptions} to finish.
|
|
276
298
|
*
|
|
277
|
-
* An unrecognised
|
|
299
|
+
* An unrecognised log level value throws rather than reaching `onError`: the
|
|
278
300
|
* level vocabulary belongs to the protocol package, which reports it, and the
|
|
279
301
|
* entry point's catch turns that into the same message-and-exit.
|
|
280
302
|
*
|
|
@@ -291,7 +313,7 @@ function isRelativePathToken(token, isCommand) {
|
|
|
291
313
|
export function parseServerSpawnOptions(args, commandName, onError = exitWithUsage) {
|
|
292
314
|
let serverSpec;
|
|
293
315
|
let cwd;
|
|
294
|
-
|
|
316
|
+
const logFlags = {};
|
|
295
317
|
const extra = [];
|
|
296
318
|
for (let index = 0; index < args.length; index += 1) {
|
|
297
319
|
const flag = args[index];
|
|
@@ -309,8 +331,8 @@ export function parseServerSpawnOptions(args, commandName, onError = exitWithUsa
|
|
|
309
331
|
else if (flag === '--cwd') {
|
|
310
332
|
cwd = claim();
|
|
311
333
|
}
|
|
312
|
-
else if (flag
|
|
313
|
-
|
|
334
|
+
else if (LOG_VALUE_FLAGS.includes(flag)) {
|
|
335
|
+
logFlags[flag] = claim();
|
|
314
336
|
}
|
|
315
337
|
else {
|
|
316
338
|
extra.push(flag);
|
|
@@ -334,6 +356,6 @@ export function parseServerSpawnOptions(args, commandName, onError = exitWithUsa
|
|
|
334
356
|
`give the workspace to the entry as its own argument (hydranium-cli ${commandName} --help)`);
|
|
335
357
|
}
|
|
336
358
|
}
|
|
337
|
-
return { serverCommand, serverArgs, cwd,
|
|
359
|
+
return { serverCommand, serverArgs, cwd, ...logOptions(logFlags), extra };
|
|
338
360
|
}
|
|
339
361
|
//# sourceMappingURL=harness-args.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harness-args.js","sourceRoot":"","sources":["../../src/commands/harness-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AA2BlF,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"harness-args.js","sourceRoot":"","sources":["../../src/commands/harness-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
9
|
import type * as HydraniumCoreNode from '@hydranium/core/node';
|
|
10
|
-
import type { LogThreshold } from '@hydranium/protocol';
|
|
11
10
|
import { type HeapReading } from '../driver-heap.js';
|
|
11
|
+
import { type LogOptions } from '../log-level.js';
|
|
12
12
|
/** The flag every report-producing subcommand names its destination file with. */
|
|
13
13
|
export declare const OUT_FILE_FLAG = "--out-file";
|
|
14
14
|
/** The `@hydranium/core/node` module surface the drivers use (type only). */
|
|
@@ -68,14 +68,13 @@ export declare function emitReport(report: string, outFile: string | undefined):
|
|
|
68
68
|
export declare function spawnNodeChild(execArgs: string[], env?: Record<string, string>): Promise<number>;
|
|
69
69
|
/** How a subcommand parent reaches its driver child; the seam `__spawnForTest` replaces. */
|
|
70
70
|
export type SpawnDriverChild = (execArgs: string[], env?: Record<string, string>) => Promise<number>;
|
|
71
|
-
/**
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
readonly logLevel?: LogThreshold;
|
|
71
|
+
/**
|
|
72
|
+
* What every `--services` subcommand carries for the child it spawns, on top of
|
|
73
|
+
* its own options. The log options apply to the head the driver boots; an
|
|
74
|
+
* absent one leaves the child's inherited environment alone, so an ambient
|
|
75
|
+
* variable still wins where a caller set one.
|
|
76
|
+
*/
|
|
77
|
+
export interface DriverSpawnOptions extends LogOptions {
|
|
79
78
|
/** Test-only: capture the node argv and env instead of spawning the real child. */
|
|
80
79
|
readonly __spawnForTest?: SpawnDriverChild;
|
|
81
80
|
/**
|
|
@@ -90,12 +89,12 @@ export interface DriverSpawnOptions {
|
|
|
90
89
|
* Parent-side: run a subcommand's driver child and propagate its exit code, so a
|
|
91
90
|
* shell or CI step sees the gate.
|
|
92
91
|
*
|
|
93
|
-
* **The log
|
|
94
|
-
* head's logger reads `
|
|
95
|
-
* which is inside the driver's dynamic import — a flag the driver
|
|
96
|
-
* arrive after the only moment it can be read. Setting
|
|
97
|
-
* exporting
|
|
98
|
-
*
|
|
92
|
+
* **The log options travel in the child's ENVIRONMENT, not its argv.** The
|
|
93
|
+
* head's logger reads its `HYDRANIUM_LOG_*` variables while `createServices`
|
|
94
|
+
* constructs it, which is inside the driver's dynamic import — a flag the driver
|
|
95
|
+
* parsed would arrive after the only moment it can be read. Setting them here
|
|
96
|
+
* rather than exporting them also leaves the CLI's own output alone, unlike
|
|
97
|
+
* ambient variables the parent would carry too.
|
|
99
98
|
*
|
|
100
99
|
* A head that binds a logger of its own decides for itself whether the flag means
|
|
101
100
|
* anything, which is the intended seam: the CLI is language-agnostic and cannot
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-harness.d.ts","sourceRoot":"","sources":["../../src/commands/headless-harness.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,KAAK,iBAAiB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"headless-harness.d.ts","sourceRoot":"","sources":["../../src/commands/headless-harness.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,KAAK,iBAAiB,MAAM,sBAAsB,CAAC;AAM/D,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAU,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG1D,kFAAkF;AAClF,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,6EAA6E;AAC7E,KAAK,cAAc,GAAG,OAAO,iBAAiB,CAAC;AAE/C;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;AAE5F,qFAAqF;AACrF,MAAM,WAAW,eAAe;IAC7B,gEAAgE;IAChE,cAAc,EAAE,eAAe,CAAC;IAChC,yEAAyE;IACzE,QAAQ,EAAE,cAAc,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CA4B1F;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAS5E;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAShG;AAED,4FAA4F;AAC5F,MAAM,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAErG;;;;;GAKG;AACH,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACnD,mFAAmF;IACnF,QAAQ,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAC3C;;;;;OAKG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,WAAW,CAAC;CAC9C;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMnG"}
|
|
@@ -12,7 +12,7 @@ import { createRequire } from 'node:module';
|
|
|
12
12
|
import * as path from 'node:path';
|
|
13
13
|
import { pathToFileURL } from 'node:url';
|
|
14
14
|
import { driverHeapArgs } from '../driver-heap.js';
|
|
15
|
-
import {
|
|
15
|
+
import { logEnv } from '../log-level.js';
|
|
16
16
|
import { SERVICES_FLAG } from './harness-args.js';
|
|
17
17
|
/** The flag every report-producing subcommand names its destination file with. */
|
|
18
18
|
export const OUT_FILE_FLAG = '--out-file';
|
|
@@ -102,12 +102,12 @@ export function spawnNodeChild(execArgs, env) {
|
|
|
102
102
|
* Parent-side: run a subcommand's driver child and propagate its exit code, so a
|
|
103
103
|
* shell or CI step sees the gate.
|
|
104
104
|
*
|
|
105
|
-
* **The log
|
|
106
|
-
* head's logger reads `
|
|
107
|
-
* which is inside the driver's dynamic import — a flag the driver
|
|
108
|
-
* arrive after the only moment it can be read. Setting
|
|
109
|
-
* exporting
|
|
110
|
-
*
|
|
105
|
+
* **The log options travel in the child's ENVIRONMENT, not its argv.** The
|
|
106
|
+
* head's logger reads its `HYDRANIUM_LOG_*` variables while `createServices`
|
|
107
|
+
* constructs it, which is inside the driver's dynamic import — a flag the driver
|
|
108
|
+
* parsed would arrive after the only moment it can be read. Setting them here
|
|
109
|
+
* rather than exporting them also leaves the CLI's own output alone, unlike
|
|
110
|
+
* ambient variables the parent would carry too.
|
|
111
111
|
*
|
|
112
112
|
* A head that binds a logger of its own decides for itself whether the flag means
|
|
113
113
|
* anything, which is the intended seam: the CLI is language-agnostic and cannot
|
|
@@ -121,7 +121,7 @@ export function spawnNodeChild(execArgs, env) {
|
|
|
121
121
|
*/
|
|
122
122
|
export async function runDriverChild(execArgs, options) {
|
|
123
123
|
const spawnChild = options.__spawnForTest ?? spawnNodeChild;
|
|
124
|
-
const code = await spawnChild([...driverHeapArgs(options.__heapReadingForTest), ...execArgs],
|
|
124
|
+
const code = await spawnChild([...driverHeapArgs(options.__heapReadingForTest), ...execArgs], logEnv(options));
|
|
125
125
|
if (code) {
|
|
126
126
|
process.exitCode = code;
|
|
127
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless-harness.js","sourceRoot":"","sources":["../../src/commands/headless-harness.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;
|
|
1
|
+
{"version":3,"file":"headless-harness.js","sourceRoot":"","sources":["../../src/commands/headless-harness.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
import { exitWithUsage, helpRequested,
|
|
9
|
+
import { exitWithUsage, helpRequested, LOG_VALUE_FLAGS, logHelpLines, logOptions, parseHarnessArgs, printHelp, SERVICES_FLAG } from './harness-args.js';
|
|
10
10
|
import { runLintGrammar } from './lint-grammar.js';
|
|
11
|
-
const VALUE_FLAGS = [
|
|
11
|
+
const VALUE_FLAGS = [...LOG_VALUE_FLAGS];
|
|
12
12
|
const BOOL_FLAGS = ['--strict', '--json'];
|
|
13
13
|
const REPEATABLE_VALUE_FLAGS = ['--name-property'];
|
|
14
14
|
/**
|
|
@@ -21,7 +21,7 @@ export const LINT_GRAMMAR_FLAGS = [SERVICES_FLAG, ...REPEATABLE_VALUE_FLAGS, ...
|
|
|
21
21
|
export const LINT_GRAMMAR_VALUE_FLAGS = [SERVICES_FLAG, ...REPEATABLE_VALUE_FLAGS, ...VALUE_FLAGS];
|
|
22
22
|
/** The `--help` text, as data, held to {@link LINT_GRAMMAR_FLAGS} by a test. */
|
|
23
23
|
export const LINT_GRAMMAR_HELP = [
|
|
24
|
-
'Usage: hydranium-cli lint-grammar --services <module> [--name-property <p>]... [--strict] [--json] [--log-level <lvl>]',
|
|
24
|
+
'Usage: hydranium-cli lint-grammar --services <module> [--name-property <p>]... [--strict] [--json] [--log-level <lvl>] [--log-file <file>] [--log-file-level <lvl>]',
|
|
25
25
|
'',
|
|
26
26
|
"Check a head's grammar against the framework's conventions — a CI gate: the",
|
|
27
27
|
'process exits non-zero when a violation is found. Read-only: no workspace is',
|
|
@@ -37,7 +37,7 @@ export const LINT_GRAMMAR_HELP = [
|
|
|
37
37
|
' (repeatable). Default: name.',
|
|
38
38
|
' --strict Also fail (non-zero exit) on warnings, not only errors.',
|
|
39
39
|
' --json Emit the raw JSON result instead of the human report.',
|
|
40
|
-
|
|
40
|
+
...logHelpLines(23)
|
|
41
41
|
];
|
|
42
42
|
export function parseLintGrammarArgs(args, onError = exitWithUsage) {
|
|
43
43
|
const { servicesModule, options, values } = parseHarnessArgs(args, 'lint-grammar', VALUE_FLAGS, BOOL_FLAGS, {
|
|
@@ -50,7 +50,7 @@ export function parseLintGrammarArgs(args, onError = exitWithUsage) {
|
|
|
50
50
|
nameProperties: values['--name-property'],
|
|
51
51
|
strict: options['--strict'] === 'true',
|
|
52
52
|
json: options['--json'] === 'true',
|
|
53
|
-
|
|
53
|
+
...logOptions(options)
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
export function runLintGrammarCommand(args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint-grammar-args.js","sourceRoot":"","sources":["../../src/commands/lint-grammar-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,aAAa,EACb,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"lint-grammar-args.js","sourceRoot":"","sources":["../../src/commands/lint-grammar-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,aAAa,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAkC,MAAM,mBAAmB,CAAC;AAEnF,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,CAAU,CAAC;AAClD,MAAM,UAAU,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAU,CAAC;AACnD,MAAM,sBAAsB,GAAG,CAAC,iBAAiB,CAAU,CAAC;AAE5D;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAsB,CAAC,aAAa,EAAE,GAAG,sBAAsB,EAAE,GAAG,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC;AAE/H,oFAAoF;AACpF,MAAM,CAAC,MAAM,wBAAwB,GAAsB,CAAC,aAAa,EAAE,GAAG,sBAAsB,EAAE,GAAG,WAAW,CAAC,CAAC;AAEtH,gFAAgF;AAChF,MAAM,CAAC,MAAM,iBAAiB,GAAsB;IACjD,qKAAqK;IACrK,EAAE;IACF,6EAA6E;IAC7E,8EAA8E;IAC9E,wEAAwE;IACxE,mFAAmF;IACnF,+EAA+E;IAC/E,0EAA0E;IAC1E,uEAAuE;IACvE,EAAE;IACF,UAAU;IACV,0FAA0F;IAC1F,6EAA6E;IAC7E,uDAAuD;IACvD,kFAAkF;IAClF,gFAAgF;IAChF,GAAG,YAAY,CAAC,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,UAAU,oBAAoB,CAAC,IAAc,EAAE,OAAO,GAAe,aAAa;IACrF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE;QACzG,gBAAgB,EAAE,KAAK;QACvB,oBAAoB,EAAE,sBAAsB;QAC5C,OAAO;KACT,CAAC,CAAC;IACH,OAAO;QACJ,cAAc;QACd,cAAc,EAAE,MAAM,CAAC,iBAAiB,CAAC;QACzC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,MAAM;QACtC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,MAAM;QAClC,GAAG,UAAU,CAAC,OAAO,CAAC;KACxB,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAc;IACjD,IAAI,aAAa,CAAC,IAAI,EAAE,wBAAwB,CAAC,EAAE,CAAC;QACjD,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;AACrD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measure-memory-args.d.ts","sourceRoot":"","sources":["../../src/commands/measure-memory-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,
|
|
1
|
+
{"version":3,"file":"measure-memory-args.d.ts","sourceRoot":"","sources":["../../src/commands/measure-memory-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAWJ,KAAK,UAAU,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA4C,KAAK,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAcjH;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAAmD,CAAC;AAEtG,oFAAoF;AACpF,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAAoC,CAAC;AAE7F,kFAAkF;AAClF,eAAO,MAAM,mBAAmB,EAAE,SAAS,MAAM,EA8BhD,CAAC;AAwBF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,UAA0B,GAAG,2BAA2B,CAqBvH;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrE"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
import { exitWithUsage, helpRequested,
|
|
9
|
+
import { exitWithUsage, helpRequested, LOG_FILE_FLAG, LOG_VALUE_FLAGS, logHelpLines, logOptions, numericOption, parseHarnessArgs, printHelp, SERVICES_FLAG } from './harness-args.js';
|
|
10
10
|
import { parseProfileDimensions, runMeasureMemory } from './measure-memory.js';
|
|
11
11
|
const VALUE_FLAGS = [
|
|
12
12
|
'--edits',
|
|
@@ -16,7 +16,7 @@ const VALUE_FLAGS = [
|
|
|
16
16
|
'--snapshot-path',
|
|
17
17
|
'--profile',
|
|
18
18
|
'--session-out',
|
|
19
|
-
|
|
19
|
+
...LOG_VALUE_FLAGS
|
|
20
20
|
];
|
|
21
21
|
const BOOL_FLAGS = ['--snapshot', '--json'];
|
|
22
22
|
/**
|
|
@@ -51,11 +51,13 @@ export const MEASURE_MEMORY_HELP = [
|
|
|
51
51
|
' --profile <dims> Capture sampled profiles around the build (+churn) into a',
|
|
52
52
|
' profiling session. Comma-separated: cpu,alloc,gc,eld,heap.',
|
|
53
53
|
' --session-out <dir> Parent directory for the profiling session folder (with --profile).',
|
|
54
|
+
' The session logs to its server.log at --log-file-level, else at',
|
|
55
|
+
' --log-level, else info; --log-file is refused beside --profile.',
|
|
54
56
|
' --json Emit the measurement as one JSON document instead of the',
|
|
55
57
|
' progress lines: documentCount, buildMs, emptyHeapBytes,',
|
|
56
58
|
' afterBuildHeapBytes, and churnGrowthBytes / snapshotPath /',
|
|
57
59
|
' profilingSession where the run produced them.',
|
|
58
|
-
|
|
60
|
+
...logHelpLines(22)
|
|
59
61
|
];
|
|
60
62
|
/**
|
|
61
63
|
* Validate `--profile` in the PARENT, where the numeric flags beside it are
|
|
@@ -81,6 +83,11 @@ function validatedProfile(csv, onError) {
|
|
|
81
83
|
}
|
|
82
84
|
export function parseMeasureMemoryArgs(args, onError = exitWithUsage) {
|
|
83
85
|
const { servicesModule, workspace, options } = parseHarnessArgs(args, 'measure-memory', VALUE_FLAGS, BOOL_FLAGS, { onError });
|
|
86
|
+
// The profiling session points the log at its own `server.log`, which would
|
|
87
|
+
// replace the requested file without a word.
|
|
88
|
+
if (options['--profile'] !== undefined && options[LOG_FILE_FLAG] !== undefined) {
|
|
89
|
+
onError(`${LOG_FILE_FLAG} cannot be combined with --profile, which logs to the session's server.log`);
|
|
90
|
+
}
|
|
84
91
|
return {
|
|
85
92
|
servicesModule,
|
|
86
93
|
workspace,
|
|
@@ -93,7 +100,7 @@ export function parseMeasureMemoryArgs(args, onError = exitWithUsage) {
|
|
|
93
100
|
profile: validatedProfile(options['--profile'], onError),
|
|
94
101
|
sessionOut: options['--session-out'],
|
|
95
102
|
json: options['--json'] === 'true',
|
|
96
|
-
|
|
103
|
+
...logOptions(options)
|
|
97
104
|
};
|
|
98
105
|
}
|
|
99
106
|
export function runMeasureMemoryCommand(args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measure-memory-args.js","sourceRoot":"","sources":["../../src/commands/measure-memory-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,aAAa,EACb,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"measure-memory-args.js","sourceRoot":"","sources":["../../src/commands/measure-memory-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
*
|
|
7
7
|
* SPDX-License-Identifier: MIT
|
|
8
8
|
********************************************************************************/
|
|
9
|
-
import { exitWithUsage, helpRequested,
|
|
9
|
+
import { exitWithUsage, helpRequested, LOG_VALUE_FLAGS, logHelpLines, logOptions, parseHarnessArgs, printHelp, SERVICES_FLAG } from './harness-args.js';
|
|
10
10
|
import { OUT_FILE_FLAG } from './headless-harness.js';
|
|
11
11
|
import { runModelDocs } from './model-docs.js';
|
|
12
|
-
const VALUE_FLAGS = [OUT_FILE_FLAG,
|
|
12
|
+
const VALUE_FLAGS = [OUT_FILE_FLAG, ...LOG_VALUE_FLAGS];
|
|
13
13
|
/**
|
|
14
14
|
* Every flag `model-docs` accepts, derived from the sets the parser is handed so
|
|
15
15
|
* the list cannot claim a flag the parser would reject. `--services` is consumed
|
|
@@ -20,7 +20,7 @@ export const MODEL_DOCS_FLAGS = [SERVICES_FLAG, ...VALUE_FLAGS];
|
|
|
20
20
|
export const MODEL_DOCS_VALUE_FLAGS = MODEL_DOCS_FLAGS;
|
|
21
21
|
/** The `--help` text, as data, held to {@link MODEL_DOCS_FLAGS} by a test. */
|
|
22
22
|
export const MODEL_DOCS_HELP = [
|
|
23
|
-
'Usage: hydranium-cli model-docs --services <module> [--out-file <file>] [--log-level <lvl>]',
|
|
23
|
+
'Usage: hydranium-cli model-docs --services <module> [--out-file <file>] [--log-level <lvl>] [--log-file <file>] [--log-file-level <lvl>]',
|
|
24
24
|
'',
|
|
25
25
|
'Generate a navigable Markdown reference of every AST node type — a type index,',
|
|
26
26
|
'cross-linked super/sub types, a reverse "referenced by" index, and a per-language',
|
|
@@ -34,14 +34,14 @@ export const MODEL_DOCS_HELP = [
|
|
|
34
34
|
' --out-file <file> Write the Markdown to this file instead of stdout. Written',
|
|
35
35
|
' only once the report exists, unlike a shell redirection,',
|
|
36
36
|
' which truncates the file before the head is even booted.',
|
|
37
|
-
|
|
37
|
+
...logHelpLines(22)
|
|
38
38
|
];
|
|
39
39
|
export function parseModelDocsArgs(args, onError = exitWithUsage) {
|
|
40
40
|
const { servicesModule, options } = parseHarnessArgs(args, 'model-docs', VALUE_FLAGS, [], {
|
|
41
41
|
requireWorkspace: false,
|
|
42
42
|
onError
|
|
43
43
|
});
|
|
44
|
-
return { servicesModule, outFile: options[OUT_FILE_FLAG],
|
|
44
|
+
return { servicesModule, outFile: options[OUT_FILE_FLAG], ...logOptions(options) };
|
|
45
45
|
}
|
|
46
46
|
export function runModelDocsCommand(args) {
|
|
47
47
|
if (helpRequested(args, MODEL_DOCS_VALUE_FLAGS)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-docs-args.js","sourceRoot":"","sources":["../../src/commands/model-docs-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,aAAa,EACb,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"model-docs-args.js","sourceRoot":"","sources":["../../src/commands/model-docs-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,aAAa,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAgC,MAAM,iBAAiB,CAAC;AAE7E,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,GAAG,eAAe,CAAU,CAAC;AAEjE;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAsB,CAAC,aAAa,EAAE,GAAG,WAAW,CAAC,CAAC;AAEnF,oFAAoF;AACpF,MAAM,CAAC,MAAM,sBAAsB,GAAsB,gBAAgB,CAAC;AAE1E,8EAA8E;AAC9E,MAAM,CAAC,MAAM,eAAe,GAAsB;IAC/C,0IAA0I;IAC1I,EAAE;IACF,gFAAgF;IAChF,mFAAmF;IACnF,gFAAgF;IAChF,kFAAkF;IAClF,4EAA4E;IAC5E,uEAAuE;IACvE,EAAE;IACF,UAAU;IACV,yFAAyF;IACzF,oFAAoF;IACpF,kFAAkF;IAClF,kFAAkF;IAClF,GAAG,YAAY,CAAC,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,UAAU,kBAAkB,CAAC,IAAc,EAAE,OAAO,GAAe,aAAa;IACnF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE;QACvF,gBAAgB,EAAE,KAAK;QACvB,OAAO;KACT,CAAC,CAAC;IACH,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAc;IAC/C,IAAI,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAAC;QAC/C,SAAS,CAAC,eAAe,CAAC,CAAC;QAC3B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects-args.d.ts","sourceRoot":"","sources":["../../src/commands/projects-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,
|
|
1
|
+
{"version":3,"file":"projects-args.d.ts","sourceRoot":"","sources":["../../src/commands/projects-args.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAQJ,KAAK,UAAU,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAe,KAAK,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEzE;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAA6B,CAAC;AAE1E;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAAmB,CAAC;AAEtE,4EAA4E;AAC5E,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EAU1C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,UAA0B,GAAG,sBAAsB,CAQ7G;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhE"}
|