@detergent-software/atk 8.9.0-dev.17 → 8.9.0-dev.18
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 +10 -0
- package/build/cli.js +7 -3
- package/build/cli.js.map +1 -1
- package/build/command-manifest.json +1507 -0
- package/build/commands/cache.d.ts +1 -1
- package/build/commands/publish.d.ts +1 -1
- package/build/commands/schema.d.ts +3 -3
- package/build/components/Header.d.ts +2 -3
- package/build/components/Header.d.ts.map +1 -1
- package/build/components/Header.js +2 -9
- package/build/components/Header.js.map +1 -1
- package/build/components/header-art.d.ts +7 -0
- package/build/components/header-art.d.ts.map +1 -0
- package/build/components/header-art.js +14 -0
- package/build/components/header-art.js.map +1 -0
- package/build/lib/pastel/commander-specs.d.ts +7 -0
- package/build/lib/pastel/commander-specs.d.ts.map +1 -0
- package/build/lib/pastel/commander-specs.js +50 -0
- package/build/lib/pastel/commander-specs.js.map +1 -0
- package/build/lib/pastel/generate-arguments.d.ts +3 -3
- package/build/lib/pastel/generate-arguments.d.ts.map +1 -1
- package/build/lib/pastel/generate-arguments.js +25 -22
- package/build/lib/pastel/generate-arguments.js.map +1 -1
- package/build/lib/pastel/generate-command.d.ts +7 -5
- package/build/lib/pastel/generate-command.d.ts.map +1 -1
- package/build/lib/pastel/generate-command.js +32 -62
- package/build/lib/pastel/generate-command.js.map +1 -1
- package/build/lib/pastel/generate-commands.d.ts +3 -5
- package/build/lib/pastel/generate-commands.d.ts.map +1 -1
- package/build/lib/pastel/generate-commands.js +6 -10
- package/build/lib/pastel/generate-commands.js.map +1 -1
- package/build/lib/pastel/generate-options.d.ts +3 -3
- package/build/lib/pastel/generate-options.d.ts.map +1 -1
- package/build/lib/pastel/generate-options.js +16 -13
- package/build/lib/pastel/generate-options.js.map +1 -1
- package/build/lib/pastel/index.d.ts +7 -0
- package/build/lib/pastel/index.d.ts.map +1 -1
- package/build/lib/pastel/index.js +16 -15
- package/build/lib/pastel/index.js.map +1 -1
- package/build/lib/pastel/internal-types.d.ts +39 -8
- package/build/lib/pastel/internal-types.d.ts.map +1 -1
- package/build/lib/pastel/manifest.d.ts +8 -0
- package/build/lib/pastel/manifest.d.ts.map +1 -0
- package/build/lib/pastel/manifest.js +7 -0
- package/build/lib/pastel/manifest.js.map +1 -0
- package/build/lib/pastel/read-commands.d.ts +7 -2
- package/build/lib/pastel/read-commands.d.ts.map +1 -1
- package/build/lib/pastel/read-commands.js +51 -30
- package/build/lib/pastel/read-commands.js.map +1 -1
- package/build/lib/pastel/render-command.d.ts +13 -0
- package/build/lib/pastel/render-command.d.ts.map +1 -0
- package/build/lib/pastel/render-command.js +56 -0
- package/build/lib/pastel/render-command.js.map +1 -0
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-options.js","sourceRoot":"","sources":["../../../src/lib/pastel/generate-options.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"generate-options.js","sourceRoot":"","sources":["../../../src/lib/pastel/generate-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
|
+
import type { CommandManifest } from './internal-types.js';
|
|
1
2
|
import type { CommandArgumentConfig, CommandOptionConfig } from './types.js';
|
|
2
3
|
export type Options = {
|
|
4
|
+
/**
|
|
5
|
+
* The commands, described ahead of time by `describeCommands` (`lib/pastel/manifest.js`), so a run imports only
|
|
6
|
+
* the command it runs. Without it, Pastel imports every command in the `commands` folder to describe them.
|
|
7
|
+
*/
|
|
8
|
+
commands?: CommandManifest;
|
|
3
9
|
/**
|
|
4
10
|
* Description. Defaults to `description` in the nearest package.json.
|
|
5
11
|
*/
|
|
@@ -52,5 +58,6 @@ export default class Pastel {
|
|
|
52
58
|
* Set additional metadata for an argument. Must be used as an argument to `describe` function from Zod.
|
|
53
59
|
*/
|
|
54
60
|
export declare function argument(config: CommandArgumentConfig): string;
|
|
61
|
+
export type { CommandManifest } from './internal-types.js';
|
|
55
62
|
export * from './types.js';
|
|
56
63
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"
|
|
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;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF;;GAEG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,mBAAmB,UAEjD;AAED,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;CA0DxC;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,qBAAqB,UAErD;AA6BD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,cAAc,YAAY,CAAC"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import process from 'node:process';
|
|
3
3
|
import { fileURLToPath } from 'node:url';
|
|
4
|
-
import { readPackageUp } from 'read-package-up';
|
|
5
|
-
import App from './_app.js';
|
|
6
4
|
import generateCommand from './generate-command.js';
|
|
7
5
|
import generateCommands from './generate-commands.js';
|
|
8
|
-
import readCommands from './read-commands.js';
|
|
9
|
-
import readCustomApp from './read-custom-app.js';
|
|
10
6
|
/** Commander's exits that are output, not errors: `--help`, `help`, a bare command group, `--version`. */
|
|
11
7
|
const NOT_USAGE_ERRORS = new Set(['commander.help', 'commander.helpDisplayed', 'commander.version']);
|
|
12
8
|
/**
|
|
@@ -25,25 +21,29 @@ export default class Pastel {
|
|
|
25
21
|
*/
|
|
26
22
|
async run(argv = process.argv) {
|
|
27
23
|
const commandsDirectory = fileURLToPath(new URL('commands', this.options.importMeta.url));
|
|
28
|
-
const appComponent = (await readCustomApp(commandsDirectory)) ?? App;
|
|
29
24
|
const program = new Command();
|
|
30
|
-
const commands = await
|
|
31
|
-
const indexCommand = commands.
|
|
25
|
+
const commands = this.options.commands ?? (await (await import('./manifest.js')).describeCommands(commandsDirectory));
|
|
26
|
+
const indexCommand = commands.find((command) => command.name === 'index');
|
|
32
27
|
if (indexCommand) {
|
|
33
|
-
generateCommand(program, indexCommand, {
|
|
34
|
-
commands.delete('index');
|
|
28
|
+
generateCommand(program, indexCommand, { commandsDirectory });
|
|
35
29
|
}
|
|
36
|
-
generateCommands(program, commands, {
|
|
30
|
+
generateCommands(program, commands.filter((command) => command !== indexCommand), { commandsDirectory });
|
|
37
31
|
if (this.options.name) {
|
|
38
32
|
program.name(this.options.name);
|
|
39
33
|
}
|
|
40
|
-
|
|
41
|
-
|
|
34
|
+
let version = this.options.version;
|
|
35
|
+
let description = indexCommand?.description ?? this.options.description;
|
|
36
|
+
// Only for what the app didn't pass: read-package-up loads about 50 ms of modules (ATK-605).
|
|
37
|
+
if (version === undefined || description === undefined) {
|
|
38
|
+
const { readPackageUp } = await import('read-package-up');
|
|
39
|
+
const package_ = await readPackageUp();
|
|
40
|
+
version ??= package_?.packageJson.version;
|
|
41
|
+
description ??= package_?.packageJson.description;
|
|
42
|
+
}
|
|
42
43
|
if (version) {
|
|
43
44
|
program.version(version, '-v, --version', 'Show version number');
|
|
44
45
|
}
|
|
45
|
-
|
|
46
|
-
program.description(description);
|
|
46
|
+
program.description(description ?? '');
|
|
47
47
|
program.helpOption('-h, --help', 'Show help');
|
|
48
48
|
if (this.options.helpHeader) {
|
|
49
49
|
program.addHelpText('beforeAll', this.options.helpHeader);
|
|
@@ -57,7 +57,8 @@ export default class Pastel {
|
|
|
57
57
|
if (this.options.onUsageError) {
|
|
58
58
|
routeUsageErrors(program, this.options.onUsageError);
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
// Async, because a command's action imports its module.
|
|
61
|
+
await program.parseAsync(argv);
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
/**
|
|
@@ -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;AACpC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/pastel/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import type { ComponentType } from 'react';
|
|
2
2
|
import type { ZodArray, ZodBoolean, ZodDefault, ZodEnum, ZodNumber, ZodObject, ZodOptional, ZodSet, ZodString, ZodTuple, ZodTypeAny } from 'zod';
|
|
3
3
|
import { type AppProps } from './types.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
/**
|
|
5
|
+
* A commander argument as plain data, described from a command's Zod `args` (`generate-arguments.tsx`) and turned
|
|
6
|
+
* back into an `Argument` without Zod (`commander-specs.ts`), so a manifest can carry it (ATK-605).
|
|
7
|
+
*/
|
|
8
|
+
export type ArgumentSpec = {
|
|
9
|
+
choices?: string[];
|
|
10
|
+
defaultValue?: unknown;
|
|
11
|
+
defaultValueDescription?: string;
|
|
9
12
|
description?: string;
|
|
10
|
-
|
|
13
|
+
/** commander's name with its brackets: `<name>`, `[name]`, `[name...]`. */
|
|
11
14
|
name: string;
|
|
12
|
-
|
|
13
|
-
|
|
15
|
+
/** `number`: one number; `number-list`: numbers collected into an array, restarting from the default. */
|
|
16
|
+
parse?: 'number' | 'number-list';
|
|
14
17
|
};
|
|
15
18
|
export type CommandArgument = ZodEnum<Record<string, number | string>> | ZodNumber | ZodString;
|
|
16
19
|
export type CommandArguments = ZodMaybeOptionalOrDefault<CommandArgumentsArray | CommandArgumentsTuple>;
|
|
@@ -27,8 +30,36 @@ export type CommandExports = {
|
|
|
27
30
|
isDefault?: boolean;
|
|
28
31
|
options?: CommandOptions;
|
|
29
32
|
};
|
|
33
|
+
/** Every command in the commands folder, the root's `index` among them, in file-name order. */
|
|
34
|
+
export type CommandManifest = CommandSpec[];
|
|
30
35
|
export type CommandOption = ZodMaybeOptionalOrDefault<ZodArray<ZodEnum<Record<string, number | string>>>> | ZodMaybeOptionalOrDefault<ZodArray<ZodNumber>> | ZodMaybeOptionalOrDefault<ZodArray<ZodString>> | ZodMaybeOptionalOrDefault<ZodBoolean> | ZodMaybeOptionalOrDefault<ZodEnum<Record<string, number | string>>> | ZodMaybeOptionalOrDefault<ZodNumber> | ZodMaybeOptionalOrDefault<ZodSet<ZodEnum<Record<string, number | string>>>> | ZodMaybeOptionalOrDefault<ZodSet<ZodNumber>> | ZodMaybeOptionalOrDefault<ZodSet<ZodString>> | ZodMaybeOptionalOrDefault<ZodString>;
|
|
31
36
|
export type CommandOptions = ZodMaybeOptional<ZodObject<Record<string, CommandOption>>>;
|
|
37
|
+
/**
|
|
38
|
+
* A command as plain data: what commander needs to parse it and print its help, without importing its module. `file`
|
|
39
|
+
* is the module (with its component) relative to the commands folder, with a `.js` extension; a folder without an
|
|
40
|
+
* `index` has none.
|
|
41
|
+
*/
|
|
42
|
+
export type CommandSpec = {
|
|
43
|
+
alias?: string;
|
|
44
|
+
args?: ArgumentSpec[];
|
|
45
|
+
commands?: CommandSpec[];
|
|
46
|
+
description?: string;
|
|
47
|
+
file?: string;
|
|
48
|
+
isDefault: boolean;
|
|
49
|
+
name: string;
|
|
50
|
+
options?: OptionSpec[];
|
|
51
|
+
};
|
|
52
|
+
/** A commander option as plain data, described from a command's Zod `options` (`generate-options.ts`). */
|
|
53
|
+
export type OptionSpec = {
|
|
54
|
+
choices?: string[];
|
|
55
|
+
/** For `parse: 'set'`, the set's members. */
|
|
56
|
+
defaultValue?: unknown;
|
|
57
|
+
defaultValueDescription?: string;
|
|
58
|
+
description?: string;
|
|
59
|
+
flags: string;
|
|
60
|
+
/** `number`: parsed as a number; `set`: repeated values collected into a `Set`. */
|
|
61
|
+
parse?: 'number' | 'set';
|
|
62
|
+
};
|
|
32
63
|
export type ZodMaybeOptional<T extends ZodTypeAny> = T | ZodOptional<T>;
|
|
33
64
|
export type ZodMaybeOptionalOrDefault<T extends ZodTypeAny> = T | ZodDefault<T> | ZodDefault<ZodOptional<T>> | ZodOptional<T> | ZodOptional<ZodDefault<T>>;
|
|
34
65
|
//# sourceMappingURL=internal-types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/internal-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EACV,QAAQ,EACR,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,MAAM,EACN,SAAS,EACT,QAAQ,EACR,UAAU,EACX,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/internal-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pastel's build-time entry: describe a commands folder as the manifest `Pastel`'s `commands` option takes. It imports
|
|
3
|
+
* every command and Zod, which is why `index.ts` doesn't re-export it (ATK-605).
|
|
4
|
+
*/
|
|
5
|
+
import readCommands from './read-commands.js';
|
|
6
|
+
export type { ArgumentSpec, CommandManifest, CommandSpec, OptionSpec } from './internal-types.js';
|
|
7
|
+
export { readCommands as describeCommands };
|
|
8
|
+
//# sourceMappingURL=manifest.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/manifest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAElG,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pastel's build-time entry: describe a commands folder as the manifest `Pastel`'s `commands` option takes. It imports
|
|
3
|
+
* every command and Zod, which is why `index.ts` doesn't re-export it (ATK-605).
|
|
4
|
+
*/
|
|
5
|
+
import readCommands from './read-commands.js';
|
|
6
|
+
export { readCommands as describeCommands };
|
|
7
|
+
//# sourceMappingURL=manifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/lib/pastel/manifest.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAI9C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
1
|
+
import type { CommandManifest } from './internal-types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Import every command in `directory` and describe it as plain data. Files are read in name order, so the manifest
|
|
4
|
+
* and the help list commands the same way on every file system. `prefix` is the folder's path from the commands
|
|
5
|
+
* folder, for `file`.
|
|
6
|
+
*/
|
|
7
|
+
declare const readCommands: (directory: string, prefix?: string) => Promise<CommandManifest>;
|
|
3
8
|
export default readCommands;
|
|
4
9
|
//# sourceMappingURL=read-commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-commands.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/read-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-commands.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/read-commands.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAkB,eAAe,EAAe,MAAM,qBAAqB,CAAC;AAKxF;;;;GAIG;AACH,QAAA,MAAM,YAAY,GAAU,WAAW,MAAM,EAAE,eAAW,KAAG,OAAO,CAAC,eAAe,CA8DnF,CAAC;AAiBF,eAAe,YAAY,CAAC"}
|
|
@@ -10,9 +10,17 @@ import decamelize from 'decamelize';
|
|
|
10
10
|
import fs from 'node:fs/promises';
|
|
11
11
|
import path from 'node:path';
|
|
12
12
|
import { pathToFileURL } from 'node:url';
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
14
|
+
import describeArguments from './generate-arguments.js';
|
|
15
|
+
import describeOptions from './generate-options.js';
|
|
16
|
+
/**
|
|
17
|
+
* Import every command in `directory` and describe it as plain data. Files are read in name order, so the manifest
|
|
18
|
+
* and the help list commands the same way on every file system. `prefix` is the folder's path from the commands
|
|
19
|
+
* folder, for `file`.
|
|
20
|
+
*/
|
|
21
|
+
const readCommands = async (directory, prefix = '') => {
|
|
22
|
+
const commands = [];
|
|
23
|
+
const files = (await fs.readdir(directory)).sort();
|
|
16
24
|
for (const file of files) {
|
|
17
25
|
if (file.startsWith('_app')) {
|
|
18
26
|
continue;
|
|
@@ -20,40 +28,53 @@ const readCommands = async (directory) => {
|
|
|
20
28
|
const filePath = path.join(directory, file);
|
|
21
29
|
const stat = await fs.stat(filePath);
|
|
22
30
|
if (stat.isDirectory()) {
|
|
23
|
-
const subCommands = await readCommands(filePath);
|
|
24
|
-
const indexCommand = subCommands.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
indexCommand
|
|
28
|
-
|
|
29
|
-
commands.set(file, indexCommand);
|
|
30
|
-
continue;
|
|
31
|
-
}
|
|
32
|
-
const command = indexCommand ?? {
|
|
33
|
-
commands: subCommands,
|
|
34
|
-
isDefault: false,
|
|
35
|
-
name: file,
|
|
36
|
-
};
|
|
37
|
-
commands.set(file, command);
|
|
31
|
+
const subCommands = await readCommands(filePath, `${prefix}${file}/`);
|
|
32
|
+
const indexCommand = subCommands.find((command) => command.name === 'index');
|
|
33
|
+
const others = subCommands.filter((command) => command !== indexCommand);
|
|
34
|
+
commands.push(indexCommand
|
|
35
|
+
? { ...indexCommand, commands: others, name: file }
|
|
36
|
+
: { commands: others, isDefault: false, name: file });
|
|
38
37
|
continue;
|
|
39
38
|
}
|
|
40
39
|
if (!/\.(js|ts)x?$/.test(file) || file.endsWith('.d.ts')) {
|
|
41
40
|
continue;
|
|
42
41
|
}
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
alias
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
42
|
+
const m = (await import(__rewriteRelativeImportExtension(pathToFileURL(filePath).href)));
|
|
43
|
+
const stem = file.replace(/\.(js|ts)x?$/, '');
|
|
44
|
+
const command = { isDefault: m.isDefault ?? false, name: decamelize(stem, { separator: '-' }) };
|
|
45
|
+
if (m.alias) {
|
|
46
|
+
command.alias = m.alias;
|
|
47
|
+
}
|
|
48
|
+
if (m.args) {
|
|
49
|
+
command.args = describeArguments(m.args);
|
|
50
|
+
}
|
|
51
|
+
if (m.description) {
|
|
52
|
+
command.description = m.description;
|
|
53
|
+
}
|
|
54
|
+
// The built module's name: under tsx, `.js` resolves to the `.ts(x)` source.
|
|
55
|
+
if (m.default) {
|
|
56
|
+
command.file = `${prefix}${stem}.js`;
|
|
57
|
+
}
|
|
58
|
+
if (m.options) {
|
|
59
|
+
command.options = describeOptions(m.options);
|
|
60
|
+
}
|
|
61
|
+
for (const spec of [...(command.args ?? []), ...(command.options ?? [])]) {
|
|
62
|
+
assertJsonDefault(spec, `${prefix}${file}`);
|
|
63
|
+
}
|
|
64
|
+
commands.push(command);
|
|
55
65
|
}
|
|
56
66
|
return commands;
|
|
57
67
|
};
|
|
68
|
+
/**
|
|
69
|
+
* The manifest is JSON, written on a developer's machine, so a default must be a constant JSON keeps as it is: not
|
|
70
|
+
* `Infinity`, a `Date` or a function's result. A default that differs between machines (`process.cwd()`, a home
|
|
71
|
+
* path) passes here but fails the manifest test anywhere else.
|
|
72
|
+
*/
|
|
73
|
+
function assertJsonDefault(spec, file) {
|
|
74
|
+
const { defaultValue } = spec;
|
|
75
|
+
if (defaultValue !== undefined && !isDeepStrictEqual(JSON.parse(JSON.stringify(defaultValue)), defaultValue)) {
|
|
76
|
+
throw new Error(`${file}: the default of ${spec.flags ?? spec.name} (${String(defaultValue)}) doesn't survive JSON, so the command manifest can't carry it.`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
58
79
|
export default readCommands;
|
|
59
80
|
//# sourceMappingURL=read-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-commands.js","sourceRoot":"","sources":["../../../src/lib/pastel/read-commands.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"read-commands.js","sourceRoot":"","sources":["../../../src/lib/pastel/read-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type Command as CommanderCommand } from 'commander';
|
|
2
|
+
import type { CommandExports } from './internal-types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Run a command once commander has parsed it: check its options and arguments against the module's Zod schemas, then
|
|
5
|
+
* render its component in the app. `generate-command.tsx` imports this only when a command runs, so help and version
|
|
6
|
+
* output never load Ink, React or Zod (ATK-605).
|
|
7
|
+
*/
|
|
8
|
+
export default function renderCommand(commanderCommand: CommanderCommand, module: CommandExports, { commandsDirectory, input, variadic }: {
|
|
9
|
+
commandsDirectory: string;
|
|
10
|
+
input: unknown[];
|
|
11
|
+
variadic: boolean;
|
|
12
|
+
}): Promise<void>;
|
|
13
|
+
//# sourceMappingURL=render-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-command.d.ts","sourceRoot":"","sources":["../../../src/lib/pastel/render-command.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAK7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D;;;;GAIG;AACH,wBAA8B,aAAa,CACzC,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,cAAc,EACtB,EAAE,iBAAiB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;IAAE,iBAAiB,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,iBA6C3G"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import {} from 'commander';
|
|
2
|
+
import { render } from 'ink';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
import { fromZodError } from 'zod-validation-error';
|
|
5
|
+
import App from './_app.js';
|
|
6
|
+
import readCustomApp from './read-custom-app.js';
|
|
7
|
+
/**
|
|
8
|
+
* Run a command once commander has parsed it: check its options and arguments against the module's Zod schemas, then
|
|
9
|
+
* render its component in the app. `generate-command.tsx` imports this only when a command runs, so help and version
|
|
10
|
+
* output never load Ink, React or Zod (ATK-605).
|
|
11
|
+
*/
|
|
12
|
+
export default async function renderCommand(commanderCommand, module, { commandsDirectory, input, variadic }) {
|
|
13
|
+
const Component = module.default;
|
|
14
|
+
// The manifest names a module only when it had a component.
|
|
15
|
+
if (!Component) {
|
|
16
|
+
throw new Error(`${commanderCommand.name()} has no default export: run \`pnpm manifest\` after changing it.`);
|
|
17
|
+
}
|
|
18
|
+
const options = input.pop();
|
|
19
|
+
let parsedOptions = {};
|
|
20
|
+
if (module.options) {
|
|
21
|
+
const result = module.options.safeParse(options);
|
|
22
|
+
if (result.success) {
|
|
23
|
+
parsedOptions = result.data ?? {};
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
rejectInput(commanderCommand, result.error);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
let arguments_ = [];
|
|
30
|
+
if (module.args) {
|
|
31
|
+
const result = module.args.safeParse(variadic ? input.flat() : input);
|
|
32
|
+
if (result.success) {
|
|
33
|
+
arguments_ = result.data ?? [];
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
rejectInput(commanderCommand, result.error);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
const appComponent = (await readCustomApp(commandsDirectory)) ?? App;
|
|
40
|
+
render(React.createElement(appComponent, {
|
|
41
|
+
commandProps: {
|
|
42
|
+
args: arguments_,
|
|
43
|
+
options: parsedOptions,
|
|
44
|
+
},
|
|
45
|
+
Component,
|
|
46
|
+
}));
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Options or arguments the command's schema rejects are a usage error, reported through commander like its own
|
|
50
|
+
* (exit 2), so `Pastel`'s `onUsageError` sees them too.
|
|
51
|
+
*/
|
|
52
|
+
function rejectInput(commanderCommand, error) {
|
|
53
|
+
const { message } = fromZodError(error, { maxIssuesInMessage: 1, prefix: '', prefixSeparator: '' });
|
|
54
|
+
commanderCommand.error(`error: ${message}`, { code: 'pastel.invalidInput', exitCode: 2 });
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=render-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-command.js","sourceRoot":"","sources":["../../../src/lib/pastel/render-command.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIpD,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,aAAa,MAAM,sBAAsB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,gBAAkC,EAClC,MAAsB,EACtB,EAAE,iBAAiB,EAAE,KAAK,EAAE,QAAQ,EAAsE;IAE1G,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IAEjC,4DAA4D;IAC5D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,kEAAkE,CAAC,CAAC;IAChH,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,EAA6B,CAAC;IACvD,IAAI,aAAa,GAA4B,EAAE,CAAC;IAEhD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEjD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,aAAa,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,IAAI,UAAU,GAAc,EAAE,CAAC;IAE/B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEtE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,UAAU,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,MAAM,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,GAAG,CAAC;IAErE,MAAM,CACJ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE;QAChC,YAAY,EAAE;YACZ,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,aAAa;SACvB;QACD,SAAS;KACV,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,gBAAkC,EAAE,KAAyC;IAChG,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;IACpG,gBAAgB,CAAC,KAAK,CAAC,UAAU,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;AAC5F,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@detergent-software/atk",
|
|
3
|
-
"version": "8.9.0-dev.
|
|
3
|
+
"version": "8.9.0-dev.18",
|
|
4
4
|
"description": "Agentic Tool Kit — CLI for managing AI coding tool assets.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -62,11 +62,11 @@
|
|
|
62
62
|
"tsx": "^4.21.0",
|
|
63
63
|
"typescript": "~6.0.3",
|
|
64
64
|
"vitest": "^5.0.3",
|
|
65
|
-
"@atk/
|
|
66
|
-
"@atk/
|
|
65
|
+
"@atk/eslint-config": "0.0.0",
|
|
66
|
+
"@atk/tsconfig": "0.0.0"
|
|
67
67
|
},
|
|
68
68
|
"scripts": {
|
|
69
|
-
"build": "tsc",
|
|
69
|
+
"build": "pnpm manifest && tsc",
|
|
70
70
|
"check:packed": "node scripts/check-packed-help.mjs",
|
|
71
71
|
"dev": "tsc --watch",
|
|
72
72
|
"export-schemas": "tsx scripts/export-schemas.ts",
|
|
@@ -74,6 +74,7 @@
|
|
|
74
74
|
"format:check": "prettier --check \"src/**/*.{ts,tsx}\"",
|
|
75
75
|
"lint": "eslint src/",
|
|
76
76
|
"lint:fix": "eslint src/ --fix --cache",
|
|
77
|
+
"manifest": "tsx scripts/write-command-manifest.ts",
|
|
77
78
|
"test": "vitest run",
|
|
78
79
|
"test:watch": "vitest",
|
|
79
80
|
"typecheck": "tsc --noEmit"
|