@detergent-software/atk 8.9.2-dev.11 → 8.9.2-dev.12
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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [8.9.2-dev.12](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.9.2-dev.11&targetVersion=GTv8.9.2-dev.12) (2026-10-20)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* **cli:** drop only the version flag the command declares (ATK-645) ([88ef766](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/88ef7660496b080bcc5a66e991b71910b7ec0684))
|
|
6
|
+
* **cli:** let a command's own -v and --version reach it (ATK-645) ([86a71df](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/86a71df57ebf7a189c3a96c12df58ad37933d336))
|
|
7
|
+
|
|
1
8
|
## [8.9.2-dev.11](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.9.2-dev.10&targetVersion=GTv8.9.2-dev.11) (2026-10-20)
|
|
2
9
|
|
|
3
10
|
### Bug Fixes
|
|
@@ -38,14 +38,11 @@ export type Options = {
|
|
|
38
38
|
*/
|
|
39
39
|
onUsageError?: (message: string) => never;
|
|
40
40
|
/**
|
|
41
|
-
* Version. Defaults to `version` in the nearest package.json.
|
|
41
|
+
* Version. Defaults to `version` in the nearest package.json. Shown by `-v, --version`, except a flag that the command
|
|
42
|
+
* named on the line declares itself.
|
|
42
43
|
*/
|
|
43
44
|
version?: string;
|
|
44
45
|
};
|
|
45
|
-
/**
|
|
46
|
-
* Set additional metadata for an option. Must be used as an argument to `describe` function from Zod.
|
|
47
|
-
*/
|
|
48
|
-
export declare function option(config: CommandOptionConfig): string;
|
|
49
46
|
export default class Pastel {
|
|
50
47
|
private readonly options;
|
|
51
48
|
constructor(options: Options);
|
|
@@ -58,6 +55,10 @@ export default class Pastel {
|
|
|
58
55
|
* Set additional metadata for an argument. Must be used as an argument to `describe` function from Zod.
|
|
59
56
|
*/
|
|
60
57
|
export declare function argument(config: CommandArgumentConfig): string;
|
|
58
|
+
/**
|
|
59
|
+
* Set additional metadata for an option. Must be used as an argument to `describe` function from Zod.
|
|
60
|
+
*/
|
|
61
|
+
export declare function option(config: CommandOptionConfig): string;
|
|
61
62
|
export type { CommandManifest } from './internal-types.js';
|
|
62
63
|
export * from './types.js';
|
|
63
64
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,OAAO,GAAG;IACpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEtE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,KAAK,CAAC;IAE1C
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,OAAO,GAAG;IACpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAEtE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IAEvB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,KAAK,CAAC;IAE1C;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAWF,MAAM,CAAC,OAAO,OAAO,MAAM;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,OAAO,EAAE,OAAO;IAI5B;;OAEG;IACG,GAAG,CAAC,IAAI,GAAE,MAAM,EAAiB;CAqExC;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,qBAAqB,UAErD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,mBAAmB,UAEjD;AA8GD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,cAAc,YAAY,CAAC"}
|
|
@@ -5,14 +5,11 @@ import generateCommand from './generate-command.js';
|
|
|
5
5
|
import generateCommands from './generate-commands.js';
|
|
6
6
|
/** Commander's exits that are output, not errors: `--help`, `help`, a bare command group, `--version`. */
|
|
7
7
|
const NOT_USAGE_ERRORS = new Set(['commander.help', 'commander.helpDisplayed', 'commander.version']);
|
|
8
|
-
/** The help and version flags `run` sets. Commander acts on them wherever they come, ahead of any command word. */
|
|
9
|
-
const OUTPUT_FLAGS = new Set(['--help', '--version', '-h', '-v']);
|
|
10
8
|
/**
|
|
11
|
-
*
|
|
9
|
+
* The help and version flags `run` sets. Commander acts on them wherever they come, ahead of any command word, except
|
|
10
|
+
* a version flag after a command that declares it itself (`programVersionFlags`).
|
|
12
11
|
*/
|
|
13
|
-
|
|
14
|
-
return `__pastel_option_config__${JSON.stringify(config)}`;
|
|
15
|
-
}
|
|
12
|
+
const OUTPUT_FLAGS = new Set(['--help', '--version', '-h', '-v']);
|
|
16
13
|
export default class Pastel {
|
|
17
14
|
options;
|
|
18
15
|
constructor(options) {
|
|
@@ -42,8 +39,10 @@ export default class Pastel {
|
|
|
42
39
|
version ??= package_?.packageJson.version;
|
|
43
40
|
description ??= package_?.packageJson.description;
|
|
44
41
|
}
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
const globalOptions = (this.options.globalOptions ?? []).map(({ description, flags }) => program.createOption(flags, description));
|
|
43
|
+
const versionFlags = programVersionFlags(program, argv.slice(2), [...program.options, ...globalOptions]);
|
|
44
|
+
if (version && versionFlags) {
|
|
45
|
+
program.version(version, versionFlags, 'Show version number');
|
|
47
46
|
}
|
|
48
47
|
program.description(description ?? '');
|
|
49
48
|
program.helpOption('-h, --help', 'Show help');
|
|
@@ -51,8 +50,8 @@ export default class Pastel {
|
|
|
51
50
|
program.addHelpText('beforeAll', this.options.helpHeader);
|
|
52
51
|
}
|
|
53
52
|
if (this.options.globalOptions) {
|
|
54
|
-
for (const
|
|
55
|
-
program.option
|
|
53
|
+
for (const option of globalOptions) {
|
|
54
|
+
program.addOption(option);
|
|
56
55
|
}
|
|
57
56
|
showGlobalOptions(program);
|
|
58
57
|
}
|
|
@@ -73,6 +72,23 @@ export default class Pastel {
|
|
|
73
72
|
export function argument(config) {
|
|
74
73
|
return `__pastel_argument_config__${JSON.stringify(config)}`;
|
|
75
74
|
}
|
|
75
|
+
/**
|
|
76
|
+
* Set additional metadata for an option. Must be used as an argument to `describe` function from Zod.
|
|
77
|
+
*/
|
|
78
|
+
export function option(config) {
|
|
79
|
+
return `__pastel_option_config__${JSON.stringify(config)}`;
|
|
80
|
+
}
|
|
81
|
+
/** The arguments before `--`, the ones commander may read as options. */
|
|
82
|
+
function beforeDoubleDash(args) {
|
|
83
|
+
const end = args.indexOf('--');
|
|
84
|
+
return end === -1 ? args : args.slice(0, end);
|
|
85
|
+
}
|
|
86
|
+
/** The program's command that `word` names or aliases. */
|
|
87
|
+
function findCommand(program, word) {
|
|
88
|
+
return word === undefined
|
|
89
|
+
? undefined
|
|
90
|
+
: program.commands.find((command) => command.name() === word || command.aliases().includes(word));
|
|
91
|
+
}
|
|
76
92
|
/**
|
|
77
93
|
* The first argument that is neither one of the program's options nor an option's value, as commander's parse reads
|
|
78
94
|
* them: a required value always follows its flag, an optional one when the next argument isn't an option. Undefined
|
|
@@ -96,6 +112,18 @@ function firstWord(args, options) {
|
|
|
96
112
|
}
|
|
97
113
|
return undefined;
|
|
98
114
|
}
|
|
115
|
+
/**
|
|
116
|
+
* The program's version flags for this run: `-v, --version`, less any the command the arguments name declares itself,
|
|
117
|
+
* as `info` does (`--version <v>`, and `-v` for `--verbose`). Commander reads a program option anywhere on the line
|
|
118
|
+
* before the command sees it, so a flag both declare would never reach the command (ATK-645). A version flag before
|
|
119
|
+
* the command word is still the program's: the scan stops there, since the program doesn't declare it yet.
|
|
120
|
+
*/
|
|
121
|
+
function programVersionFlags(program, args, options) {
|
|
122
|
+
const command = findCommand(program, firstWord(beforeDoubleDash(args), options));
|
|
123
|
+
return ['-v', '--version']
|
|
124
|
+
.filter((flag) => !command?.options.some((option) => option.short === flag || option.long === flag))
|
|
125
|
+
.join(', ');
|
|
126
|
+
}
|
|
99
127
|
/**
|
|
100
128
|
* The index command is the program's own action, so commander hands it every first word that names no command, and
|
|
101
129
|
* an index with no arguments reports "too many arguments" for it, or an option after the word as unknown. Report the
|
|
@@ -103,15 +131,12 @@ function firstWord(args, options) {
|
|
|
103
131
|
* Help and version, an option the program doesn't declare, and everything after `--` are left to commander.
|
|
104
132
|
*/
|
|
105
133
|
function rejectUnknownCommand(program, args) {
|
|
106
|
-
const
|
|
107
|
-
const scanned = end === -1 ? args : args.slice(0, end);
|
|
134
|
+
const scanned = beforeDoubleDash(args);
|
|
108
135
|
if (program.commands.length === 0 || scanned.some((arg) => OUTPUT_FLAGS.has(arg))) {
|
|
109
136
|
return;
|
|
110
137
|
}
|
|
111
138
|
const word = firstWord(scanned, program.options);
|
|
112
|
-
if (word === undefined ||
|
|
113
|
-
word === 'help' ||
|
|
114
|
-
program.commands.some((command) => command.name() === word || command.aliases().includes(word))) {
|
|
139
|
+
if (word === undefined || word === 'help' || findCommand(program, word)) {
|
|
115
140
|
return;
|
|
116
141
|
}
|
|
117
142
|
// Commander words the error and its suggestion from `args`. The method isn't in its typings.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,WAAW,CAAC;AACjD,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAKzC,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"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"}
|