@nzyme/cli 0.15.1 → 0.16.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.
Files changed (101) hide show
  1. package/dist/NzymePackageConfig.d.ts +2 -0
  2. package/dist/affected/AffectedConfig.d.ts +61 -0
  3. package/dist/affected/AffectedConfig.js +73 -0
  4. package/dist/affected/AffectedConfig.js.map +1 -0
  5. package/dist/affected/AffectedConfig.test.js +48 -0
  6. package/dist/affected/AffectedConfig.test.js.map +1 -0
  7. package/dist/affected/affected.test.js +154 -0
  8. package/dist/affected/affected.test.js.map +1 -0
  9. package/dist/affected/collectChangedFiles.d.ts +25 -0
  10. package/dist/affected/collectChangedFiles.js +83 -0
  11. package/dist/affected/collectChangedFiles.js.map +1 -0
  12. package/dist/affected/rewriteChangedPath.d.ts +7 -0
  13. package/dist/affected/rewriteChangedPath.js +15 -0
  14. package/dist/affected/rewriteChangedPath.js.map +1 -0
  15. package/dist/affected/selectAffectedFiles.d.ts +52 -0
  16. package/dist/affected/selectAffectedFiles.js +135 -0
  17. package/dist/affected/selectAffectedFiles.js.map +1 -0
  18. package/dist/affected/selectAffectedFiles.test.d.ts +1 -0
  19. package/dist/affected/selectAffectedFiles.test.js +207 -0
  20. package/dist/affected/selectAffectedFiles.test.js.map +1 -0
  21. package/dist/cli.js +23 -15
  22. package/dist/cli.js.map +1 -1
  23. package/dist/codeIndex/NzymeIndexConfig.js +5 -33
  24. package/dist/codeIndex/NzymeIndexConfig.js.map +1 -1
  25. package/dist/codeIndex/collectIndexSourceFiles.d.ts +3 -3
  26. package/dist/codeIndex/collectIndexSourceFiles.js +7 -37
  27. package/dist/codeIndex/collectIndexSourceFiles.js.map +1 -1
  28. package/dist/codeIndex/collectSymbols.test.js +7 -3
  29. package/dist/codeIndex/collectSymbols.test.js.map +1 -1
  30. package/dist/codeIndex/importPathOf.js +2 -2
  31. package/dist/codeIndex/importPathOf.js.map +1 -1
  32. package/dist/commands/DepcheckCommand.d.ts +1 -1
  33. package/dist/commands/DepcheckCommand.js +2 -2
  34. package/dist/commands/DepcheckCommand.js.map +1 -1
  35. package/dist/commands/GitAffectedCommand.d.ts +25 -0
  36. package/dist/commands/GitAffectedCommand.js +229 -0
  37. package/dist/commands/GitAffectedCommand.js.map +1 -0
  38. package/dist/commands/GitAffectedCommand.test.d.ts +1 -0
  39. package/dist/commands/GitAffectedCommand.test.js +159 -0
  40. package/dist/commands/GitAffectedCommand.test.js.map +1 -0
  41. package/dist/commands/GitBaseCommand.d.ts +17 -0
  42. package/dist/commands/GitBaseCommand.js +48 -0
  43. package/dist/commands/GitBaseCommand.js.map +1 -0
  44. package/dist/commands/GitBaseCommand.test.d.ts +1 -0
  45. package/dist/commands/GitBaseCommand.test.js +76 -0
  46. package/dist/commands/GitBaseCommand.test.js.map +1 -0
  47. package/dist/commands/IndexCommand.d.ts +1 -1
  48. package/dist/commands/IndexCommand.js +1 -1
  49. package/dist/commands/IndexCommand.js.map +1 -1
  50. package/dist/commands/LocaliseCommand.d.ts +1 -1
  51. package/dist/commands/LocaliseCommand.js +2 -2
  52. package/dist/commands/LocaliseCommand.js.map +1 -1
  53. package/dist/commands/MonorepoCommand.d.ts +1 -1
  54. package/dist/commands/MonorepoCommand.js +4 -6
  55. package/dist/commands/MonorepoCommand.js.map +1 -1
  56. package/dist/commands/QuietRunCommand.d.ts +1 -1
  57. package/dist/commands/QuietRunCommand.js +12 -21
  58. package/dist/commands/QuietRunCommand.js.map +1 -1
  59. package/dist/commands/SubmoduleBumpCommand.d.ts +1 -1
  60. package/dist/commands/SubmoduleBumpCommand.js +2 -2
  61. package/dist/commands/SubmoduleBumpCommand.js.map +1 -1
  62. package/dist/plugins/loadPlugins.d.ts +8 -0
  63. package/dist/plugins/loadPlugins.js +60 -0
  64. package/dist/plugins/loadPlugins.js.map +1 -0
  65. package/dist/plugins/loadPlugins.test.d.ts +1 -0
  66. package/dist/plugins/loadPlugins.test.js +129 -0
  67. package/dist/plugins/loadPlugins.test.js.map +1 -0
  68. package/dist/submodule/GitRepository.d.ts +4 -0
  69. package/dist/submodule/GitRepository.js +15 -6
  70. package/dist/submodule/GitRepository.js.map +1 -1
  71. package/dist/utils/createConfigParsers.d.ts +15 -0
  72. package/dist/utils/createConfigParsers.js +42 -0
  73. package/dist/utils/createConfigParsers.js.map +1 -0
  74. package/dist/utils/readNzymeConfig.d.ts +9 -0
  75. package/dist/utils/readNzymeConfig.js +16 -0
  76. package/dist/utils/readNzymeConfig.js.map +1 -0
  77. package/dist/utils/readProperty.d.ts +7 -0
  78. package/dist/utils/readProperty.js +13 -0
  79. package/dist/utils/readProperty.js.map +1 -0
  80. package/package.json +23 -38
  81. package/dist/Command.d.ts +0 -59
  82. package/dist/Command.js +0 -87
  83. package/dist/Command.js.map +0 -1
  84. package/dist/Command.test.js +0 -77
  85. package/dist/Command.test.js.map +0 -1
  86. package/dist/commands/FormatMarkdownCommand.d.ts +0 -22
  87. package/dist/commands/FormatMarkdownCommand.js +0 -256
  88. package/dist/commands/FormatMarkdownCommand.js.map +0 -1
  89. package/dist/commands/FormatMarkdownCommand.test.js +0 -82
  90. package/dist/commands/FormatMarkdownCommand.test.js.map +0 -1
  91. package/dist/execute.d.ts +0 -25
  92. package/dist/execute.js +0 -22
  93. package/dist/execute.js.map +0 -1
  94. package/dist/index.d.ts +0 -4
  95. package/dist/index.js +0 -5
  96. package/dist/index.js.map +0 -1
  97. package/dist/initialize.d.ts +0 -4
  98. package/dist/initialize.js +0 -10
  99. package/dist/initialize.js.map +0 -1
  100. /package/dist/{Command.test.d.ts → affected/AffectedConfig.test.d.ts} +0 -0
  101. /package/dist/{commands/FormatMarkdownCommand.test.d.ts → affected/affected.test.d.ts} +0 -0
@@ -0,0 +1,129 @@
1
+ import fs from 'node:fs/promises';
2
+ import os from 'node:os';
3
+ import path from 'node:path';
4
+ import { expect, test } from 'bun:test';
5
+ const CLI_PATH = new URL('../cli.ts', import.meta.url).pathname;
6
+ const CLI_CORE_PATH = new URL('../../../cli-core', import.meta.url).pathname;
7
+ const WORKING_PLUGIN = `
8
+ import { Command } from '@nzyme/cli-core/Command.js';
9
+ import { Option } from '@nzyme/cli-core';
10
+
11
+ class HelloCommand extends Command {
12
+ static paths = [['hello']];
13
+ static usage = { description: 'Says hello' };
14
+ name = Option.String('--name', 'world');
15
+ run() {
16
+ process.stdout.write('hello ' + this.name + '\\n');
17
+ }
18
+ }
19
+
20
+ export default { commands: [HelloCommand] };
21
+ `;
22
+ const THROWING_PLUGIN = `
23
+ throw new Error('plugin blew up');
24
+ `;
25
+ test('a repo plugin adds a runnable command, listed in --help', async () => {
26
+ const repo = await createRepo({ 'plugin.ts': WORKING_PLUGIN }, ['./plugin.ts']);
27
+ const run = await runCli(repo, ['hello', '--name', 'nzyme']);
28
+ expect(run).toEqual({ exitCode: 0, stdout: 'hello nzyme\n', stderr: '' });
29
+ const help = await runCli(repo, ['--help']);
30
+ expect(help.exitCode).toBe(0);
31
+ expect(help.stdout).toContain('Says hello');
32
+ });
33
+ test('plugin paths resolve against the project root, not the cwd', async () => {
34
+ const repo = await createRepo({ 'tools/plugin.ts': WORKING_PLUGIN }, ['./tools/plugin.ts']);
35
+ await fs.mkdir(path.join(repo, 'packages/a'), { recursive: true });
36
+ const result = await runCli(path.join(repo, 'packages/a'), ['hello']);
37
+ expect(result).toEqual({ exitCode: 0, stdout: 'hello world\n', stderr: '' });
38
+ });
39
+ test('a plugin command may start with the first word of a built-in', async () => {
40
+ const source = WORKING_PLUGIN.replace("[['hello']]", "[['index', 'rebuild']]");
41
+ const repo = await createRepo({ 'plugin.ts': source }, ['./plugin.ts']);
42
+ const result = await runCli(repo, ['index', 'rebuild']);
43
+ expect(result).toEqual({ exitCode: 0, stdout: 'hello world\n', stderr: '' });
44
+ });
45
+ test('a broken plugin only warns on stderr; the other commands still run', async () => {
46
+ const repo = await createRepo({ 'plugin.ts': WORKING_PLUGIN, 'broken.ts': THROWING_PLUGIN }, [
47
+ './broken.ts',
48
+ './plugin.ts',
49
+ ]);
50
+ const result = await runCli(repo, ['hello']);
51
+ expect(result).toEqual({
52
+ exitCode: 0,
53
+ stdout: 'hello world\n',
54
+ stderr: 'Warning: cannot load the nzyme plugin ./broken.ts: plugin blew up\n',
55
+ });
56
+ });
57
+ test('a command of a broken plugin fails as an unknown command', async () => {
58
+ const repo = await createRepo({ 'plugin.ts': THROWING_PLUGIN }, ['./plugin.ts']);
59
+ const result = await runCli(repo, ['hello']);
60
+ expect(result.exitCode).toBe(1);
61
+ expect(result.stdout).toContain('Command not found');
62
+ expect(result.stderr).toContain('./plugin.ts: plugin blew up');
63
+ });
64
+ test.each([
65
+ ['throws on import', THROWING_PLUGIN, 'plugin blew up'],
66
+ ['has no default export', 'export const commands = [];', 'default-export'],
67
+ ['has no commands array', 'export default { commands: "hello" };', 'default-export'],
68
+ ['lists a non-command', 'export default { commands: [{}] };', 'default-export'],
69
+ ])('the CLI warns with the path and the cause when a plugin %s', async (_name, source, cause) => {
70
+ const repo = await createRepo({ 'plugin.ts': source }, ['./plugin.ts']);
71
+ const result = await runCli(repo, ['--help']);
72
+ expect(result.exitCode).toBe(0);
73
+ expect(result.stderr).toContain('Warning: cannot load the nzyme plugin ./plugin.ts');
74
+ expect(result.stderr).toContain(cause);
75
+ });
76
+ test('the CLI warns with the path when a plugin file is missing', async () => {
77
+ const repo = await createRepo({}, ['./missing.ts']);
78
+ const result = await runCli(repo, ['--help']);
79
+ expect(result.exitCode).toBe(0);
80
+ expect(result.stderr).toContain('./missing.ts');
81
+ expect(result.stderr).toContain('Cannot find module');
82
+ });
83
+ test('a malformed nzyme.plugins only warns', async () => {
84
+ const repo = await createRepo({});
85
+ await fs.writeFile(path.join(repo, 'package.json'), JSON.stringify({ name: 'r', nzyme: { plugins: './a.ts' } }));
86
+ const result = await runCli(repo, ['--help']);
87
+ expect(result.exitCode).toBe(0);
88
+ expect(result.stderr).toContain('`nzyme.plugins` must be an array of paths');
89
+ });
90
+ test('a repo with no plugins keeps the unknown-command behaviour', async () => {
91
+ const repo = await createRepo({});
92
+ const result = await runCli(repo, ['hello']);
93
+ expect(result.exitCode).toBe(1);
94
+ expect(result.stdout).toContain('Command not found');
95
+ expect(result.stderr).toBe('');
96
+ });
97
+ test('a command named secrets gets no .env loading from nzyme', async () => {
98
+ const source = WORKING_PLUGIN.replace("[['hello']]", "[['secrets']]");
99
+ const repo = await createRepo({ 'plugin.ts': source, '.env': 'A=1\n' }, ['./plugin.ts']);
100
+ const result = await runCli(repo, ['secrets']);
101
+ expect(result).toEqual({ exitCode: 0, stdout: 'hello world\n', stderr: '' });
102
+ });
103
+ async function createRepo(files, plugins) {
104
+ const repo = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), 'nzyme-plugins-')));
105
+ const manifest = { name: 'scratch', ...(plugins ? { nzyme: { plugins } } : {}) };
106
+ await fs.writeFile(path.join(repo, 'package.json'), JSON.stringify(manifest));
107
+ for (const [file, content] of Object.entries(files)) {
108
+ await fs.mkdir(path.dirname(path.join(repo, file)), { recursive: true });
109
+ await fs.writeFile(path.join(repo, file), content);
110
+ }
111
+ await fs.mkdir(path.join(repo, 'node_modules/@nzyme'), { recursive: true });
112
+ await fs.symlink(CLI_CORE_PATH, path.join(repo, 'node_modules/@nzyme/cli-core'));
113
+ return repo;
114
+ }
115
+ async function runCli(cwd, args, env = {}) {
116
+ const proc = Bun.spawn([process.execPath, CLI_PATH, ...args], {
117
+ cwd,
118
+ env: { ...process.env, ...env },
119
+ stdout: 'pipe',
120
+ stderr: 'pipe',
121
+ });
122
+ const [stdout, stderr, exitCode] = await Promise.all([
123
+ new Response(proc.stdout).text(),
124
+ new Response(proc.stderr).text(),
125
+ proc.exited,
126
+ ]);
127
+ return { exitCode, stdout, stderr };
128
+ }
129
+ //# sourceMappingURL=loadPlugins.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"loadPlugins.test.js","sourceRoot":"","sources":["../../src/plugins/loadPlugins.test.ts"],"names":[],"mappings":"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"}
@@ -29,12 +29,16 @@ export declare class GitRepository {
29
29
  * submodule at `HEAD`, so a typo in `--path` cannot silently act on nothing.
30
30
  */
31
31
  readGitlink(submodulePath: string): Promise<string>;
32
+ /** The submodule commit `revision` records for `submodulePath`, or `null` when it is not a submodule there. */
33
+ findGitlink(revision: string, submodulePath: string): Promise<string | null>;
32
34
  /**
33
35
  * Throws unless this directory is the top of a checked-out repository. An uninitialised
34
36
  * submodule is an empty directory, and git run inside it would silently act on the parent
35
37
  * repository instead.
36
38
  */
37
39
  assertCheckedOut(): Promise<void>;
40
+ /** Whether this directory is the top of a checked-out repository (see `assertCheckedOut`). */
41
+ isCheckedOut(): Promise<boolean>;
38
42
  /**
39
43
  * Makes the history deep enough for an ancestry check. A shallow clone (what CI checkouts make by
40
44
  * default) cuts the parent links `merge-base --is-ancestor` walks, so a perfectly linear
@@ -22,12 +22,17 @@ export class GitRepository {
22
22
  * submodule at `HEAD`, so a typo in `--path` cannot silently act on nothing.
23
23
  */
24
24
  async readGitlink(submodulePath) {
25
- const entry = await this.git(['ls-tree', 'HEAD', '--', submodulePath]);
26
- const match = /^(\d+) \w+ ([0-9a-f]+)\t/.exec(entry);
27
- if (!match?.[2] || match[1] !== GITLINK_MODE) {
25
+ const gitlink = await this.findGitlink('HEAD', submodulePath);
26
+ if (gitlink === null) {
28
27
  throw new Error(`"${submodulePath}" is not a submodule at HEAD of ${this.dir} (no gitlink in its tree).`);
29
28
  }
30
- return match[2];
29
+ return gitlink;
30
+ }
31
+ /** The submodule commit `revision` records for `submodulePath`, or `null` when it is not a submodule there. */
32
+ async findGitlink(revision, submodulePath) {
33
+ const entry = await this.git(['ls-tree', revision, '--', submodulePath]);
34
+ const match = /^(\d+) \w+ ([0-9a-f]+)\t/.exec(entry);
35
+ return match?.[2] && match[1] === GITLINK_MODE ? match[2] : null;
31
36
  }
32
37
  /**
33
38
  * Throws unless this directory is the top of a checked-out repository. An uninitialised
@@ -35,11 +40,15 @@ export class GitRepository {
35
40
  * repository instead.
36
41
  */
37
42
  async assertCheckedOut() {
38
- const prefix = await this.tryGit(['rev-parse', '--show-prefix']);
39
- if (!prefix.ok || prefix.stdout !== '') {
43
+ if (!(await this.isCheckedOut())) {
40
44
  throw new Error(`${this.dir} is not a checked-out submodule. Run \`git submodule update --init\` first.`);
41
45
  }
42
46
  }
47
+ /** Whether this directory is the top of a checked-out repository (see `assertCheckedOut`). */
48
+ async isCheckedOut() {
49
+ const prefix = await this.tryGit(['rev-parse', '--show-prefix']);
50
+ return prefix.ok && prefix.stdout === '';
51
+ }
43
52
  /**
44
53
  * Makes the history deep enough for an ancestry check. A shallow clone (what CI checkouts make by
45
54
  * default) cuts the parent links `merge-base --is-ancestor` walks, so a perfectly linear
@@ -1 +1 @@
1
- {"version":3,"file":"GitRepository.js","sourceRoot":"","sources":["../../src/submodule/GitRepository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GitRepository.js","sourceRoot":"","sources":["../../src/submodule/GitRepository.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
1
+ /**
2
+ * Validators for a hand-rolled `nzyme.*` config read from `package.json`, all throwing the same
3
+ * error, which names the config and the offending path: ``Invalid <label> config in package.json:
4
+ * `<path>` must be <expected>.``
5
+ *
6
+ * @param label - The config named in the error, e.g. 'code index'.
7
+ * @util
8
+ * @__NO_SIDE_EFFECTS__
9
+ */
10
+ export declare function createConfigParsers(label: string): {
11
+ parseArray: <T>(value: unknown, path: string, parseItem: (item: unknown, path: string) => T) => T[];
12
+ parseStringArray: (value: unknown, path: string) => string[];
13
+ parseString: (value: unknown, path: string) => string;
14
+ configError: (path: string, expected: string) => Error;
15
+ };
@@ -0,0 +1,42 @@
1
+ /**
2
+ * Validators for a hand-rolled `nzyme.*` config read from `package.json`, all throwing the same
3
+ * error, which names the config and the offending path: ``Invalid <label> config in package.json:
4
+ * `<path>` must be <expected>.``
5
+ *
6
+ * @param label - The config named in the error, e.g. 'code index'.
7
+ * @util
8
+ * @__NO_SIDE_EFFECTS__
9
+ */
10
+ export function createConfigParsers(label) {
11
+ return { parseArray, parseStringArray, parseString, configError };
12
+ /** Validates an array, each item with `parseItem`. */
13
+ function parseArray(value, path, parseItem) {
14
+ if (!Array.isArray(value)) {
15
+ throw configError(path, 'an array');
16
+ }
17
+ const items = [];
18
+ for (const [index, item] of value.entries()) {
19
+ items.push(parseItem(item, `${path}[${index}]`));
20
+ }
21
+ return items;
22
+ }
23
+ /** Validates an array of non-empty strings. */
24
+ function parseStringArray(value, path) {
25
+ if (!Array.isArray(value)) {
26
+ throw configError(path, 'an array of strings');
27
+ }
28
+ return parseArray(value, path, parseString);
29
+ }
30
+ /** Validates a non-empty string. */
31
+ function parseString(value, path) {
32
+ if (typeof value !== 'string' || value === '') {
33
+ throw configError(path, 'a non-empty string');
34
+ }
35
+ return value;
36
+ }
37
+ /** The error for a config value of the wrong shape. */
38
+ function configError(path, expected) {
39
+ return new Error(`Invalid ${label} config in package.json: \`${path}\` must be ${expected}.`);
40
+ }
41
+ }
42
+ //# sourceMappingURL=createConfigParsers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"createConfigParsers.js","sourceRoot":"","sources":["../../src/utils/createConfigParsers.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC7C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAElE,sDAAsD;IACtD,SAAS,UAAU,CAAI,KAAc,EAAE,IAAY,EAAE,SAA6C;QAC9F,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,+CAA+C;IAC/C,SAAS,gBAAgB,CAAC,KAAc,EAAE,IAAY;QAClD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,WAAW,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAChD,CAAC;IAED,oCAAoC;IACpC,SAAS,WAAW,CAAC,KAAc,EAAE,IAAY;QAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YAC5C,MAAM,WAAW,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,uDAAuD;IACvD,SAAS,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC/C,OAAO,IAAI,KAAK,CAAC,WAAW,KAAK,8BAA8B,IAAI,cAAc,QAAQ,GAAG,CAAC,CAAC;IAClG,CAAC;AACL,CAAC"}
@@ -0,0 +1,9 @@
1
+ /**
2
+ * Reads the raw `nzyme` field of `<root>/package.json`, where a repo configures the `nzyme` binary.
3
+ * Unvalidated: each reader checks the part it owns and names the offending path itself.
4
+ *
5
+ * @param root - The repo root.
6
+ * @returns The field's value, or `undefined` when the manifest has none.
7
+ * @util
8
+ */
9
+ export declare function readNzymeConfig(root: string): Promise<unknown>;
@@ -0,0 +1,16 @@
1
+ import { readFile } from 'node:fs/promises';
2
+ import { join } from 'node:path';
3
+ import { isPlainObject } from '@nzyme/utils/isPlainObject.js';
4
+ /**
5
+ * Reads the raw `nzyme` field of `<root>/package.json`, where a repo configures the `nzyme` binary.
6
+ * Unvalidated: each reader checks the part it owns and names the offending path itself.
7
+ *
8
+ * @param root - The repo root.
9
+ * @returns The field's value, or `undefined` when the manifest has none.
10
+ * @util
11
+ */
12
+ export async function readNzymeConfig(root) {
13
+ const packageJson = JSON.parse(await readFile(join(root, 'package.json'), 'utf8'));
14
+ return isPlainObject(packageJson) ? packageJson.nzyme : undefined;
15
+ }
16
+ //# sourceMappingURL=readNzymeConfig.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"readNzymeConfig.js","sourceRoot":"","sources":["../../src/utils/readNzymeConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY;IAC9C,MAAM,WAAW,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5F,OAAO,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACtE,CAAC"}
@@ -0,0 +1,7 @@
1
+ /**
2
+ * Reads an own property of an `unknown` value, or `undefined` when the value is not an object or
3
+ * lacks the key. Unlike `isPlainObject`, it accepts any object, a null-prototype module namespace
4
+ * included.
5
+ * @util
6
+ */
7
+ export declare function readProperty(value: unknown, key: string): unknown;
@@ -0,0 +1,13 @@
1
+ /**
2
+ * Reads an own property of an `unknown` value, or `undefined` when the value is not an object or
3
+ * lacks the key. Unlike `isPlainObject`, it accepts any object, a null-prototype module namespace
4
+ * included.
5
+ * @util
6
+ */
7
+ export function readProperty(value, key) {
8
+ if (typeof value !== 'object' || value === null || !(key in value)) {
9
+ return undefined;
10
+ }
11
+ return Object.getOwnPropertyDescriptor(value, key)?.value;
12
+ }
13
+ //# sourceMappingURL=readProperty.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"readProperty.js","sourceRoot":"","sources":["../../src/utils/readProperty.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAc,EAAE,GAAW;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;QACjE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC;AAC9D,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@nzyme/cli",
3
- "version": "0.15.1",
4
- "description": "CLI framework (clipanion-based Command base)",
3
+ "version": "0.16.0",
4
+ "description": "The nzyme binary: monorepo, localise, index, quiet-run and other repo commands",
5
5
  "license": "MIT",
6
6
  "author": "Michał Kędrzyński <m.kedrzynski@gmail.com>",
7
7
  "repository": {
@@ -17,15 +17,10 @@
17
17
  ],
18
18
  "type": "module",
19
19
  "exports": {
20
- ".": {
21
- "types": "./dist/index.d.ts",
22
- "import": "./dist/index.js",
23
- "default": "./dist/index.js"
24
- },
25
20
  "./*.js": {
26
21
  "types": "./dist/*.d.ts",
27
- "import": "./dist/*.js",
28
22
  "source": "./src/*.ts",
23
+ "import": "./dist/*.js",
29
24
  "default": "./dist/*.js"
30
25
  }
31
26
  },
@@ -37,40 +32,30 @@
37
32
  "format": "oxfmt ./src > /dev/null"
38
33
  },
39
34
  "dependencies": {
40
- "@nzyme/i18n-compiler": "0.15.1",
41
- "@nzyme/ioc": "0.15.1",
42
- "@nzyme/logging": "0.15.1",
43
- "@nzyme/node-utils": "0.15.1",
44
- "@nzyme/project-utils": "0.15.1",
45
- "@nzyme/utils": "0.15.1",
46
- "@types/fs-extra": "11.0.4",
47
- "chalk": "6.0.1",
48
- "chokidar": "5.0.0",
49
- "clipanion": "4.0.0-rc.4",
50
- "comment-json": "5.0.0",
51
- "compare-versions": "6.1.1",
52
- "depcheck": "1.4.7",
53
- "enquirer": "2.4.1",
54
- "execa": "10.1.0",
55
- "fs-extra": "11.4.1",
56
- "latest-version": "9.0.0",
57
- "lodash.merge": "4.6.2",
58
- "mdast-util-to-markdown": "2.2.0",
59
- "remark": "15.0.1",
60
- "remark-frontmatter": "5.0.0",
61
- "remark-gfm": "4.0.1",
62
- "source-map-support": "0.5.21",
63
- "type-fest": "5.10.0",
64
- "typescript": "6.0.3"
35
+ "@nzyme/cli-core": "0.16.0",
36
+ "@nzyme/i18n-compiler": "0.16.0",
37
+ "@nzyme/project-utils": "0.16.0",
38
+ "@nzyme/utils": "0.16.0",
39
+ "@types/fs-extra": "^11.0.4",
40
+ "chalk": "^6.0.1",
41
+ "chokidar": "^6.0.0",
42
+ "comment-json": "^5.0.0",
43
+ "compare-versions": "^6.1.1",
44
+ "depcheck": "^1.4.7",
45
+ "enquirer": "^2.4.1",
46
+ "execa": "^10.2.0",
47
+ "fs-extra": "^11.4.1",
48
+ "latest-version": "^9.0.0",
49
+ "lodash.merge": "^4.6.2",
50
+ "type-fest": "^5.10.0",
51
+ "typescript": "^6.0.3"
65
52
  },
66
53
  "devDependencies": {
67
- "@nzyme/tsconfig": "0.15.1",
54
+ "@nzyme/tsconfig": "0.16.0",
68
55
  "@types/lodash.merge": "4.6.9",
69
- "@types/mdast": "4.0.4",
70
- "@types/node": "26.6.5",
71
- "@types/source-map-support": "0.5.10",
56
+ "@types/node": "26.6.6",
72
57
  "@typescript/native-preview": "^7.0.0-dev.20260707.2",
73
- "oxfmt": "0.72.0"
58
+ "oxfmt": "0.77.0"
74
59
  },
75
60
  "engines": {
76
61
  "node": ">=20"
package/dist/Command.d.ts DELETED
@@ -1,59 +0,0 @@
1
- import type { BaseContext, CommandClass as ClipanionCommandClass } from 'clipanion';
2
- import { Command as ClipanionCommand } from 'clipanion';
3
- import type { Container } from '@nzyme/ioc/Container.js';
4
- import { Logger } from '@nzyme/logging/Logger.js';
5
- /**
6
- * Rewrites an error a command threw before it is reported — e.g. to turn an opaque library failure
7
- * into an actionable message. Returns (or resolves to) the error to report in its place, or
8
- * `null`/`undefined` to report the original unchanged.
9
- */
10
- export type CommandErrorHandler = (error: unknown) => unknown;
11
- /** Clipanion command context extended with an IoC container. */
12
- export interface CommandContext extends BaseContext {
13
- /** The IoC container available to all commands. */
14
- container: Container;
15
- /** Applied by {@link Command.catch} to every error a command throws, before it is reported. */
16
- onError?: CommandErrorHandler;
17
- }
18
- /** Scope identifier for command-level IoC container isolation. */
19
- export declare const CommandScope: Readonly<{
20
- name: string;
21
- }>;
22
- /** A Clipanion command class with the CommandContext. */
23
- export type CommandClass = ClipanionCommandClass<CommandContext>;
24
- /** Base class for CLI commands with IoC container, logging, and lifecycle events. */
25
- export declare abstract class Command extends ClipanionCommand<CommandContext> {
26
- #private;
27
- /**
28
- * Event emitter for the before run event
29
- */
30
- get beforeRun(): import("@nzyme/utils/createEventEmitter.js").EventEmitter<[]>;
31
- /**
32
- * Event emitter for the after run event
33
- */
34
- get afterRun(): import("@nzyme/utils/createEventEmitter.js").EventEmitter<[]>;
35
- /**
36
- * Event emitter for the cleanup event
37
- */
38
- get cleanup(): import("@nzyme/utils/createEventEmitter.js").EventEmitter<[]>;
39
- /** The command's scoped IoC container. Throws if accessed before setup. */
40
- get container(): Container;
41
- /** The command's logger instance. Throws if accessed before setup. */
42
- get logger(): Logger;
43
- private readonly beforeRunEvent;
44
- private readonly afterRunEvent;
45
- private readonly cleanupEvent;
46
- /** Runs the command lifecycle: setup, beforeRun, run, afterRun, cleanup. */
47
- execute(): Promise<void | number>;
48
- /**
49
- * Logs the error and exits the process with code 1. The error is first passed through the
50
- * context's `onError` handler, so one handler set on `execute()` covers every command — clipanion
51
- * routes every command failure through `catch()`, making it the single place to apply it.
52
- * Parameter is intentionally not named `error`/`err` — that shape makes
53
- * eslint-plugin-promise's `no-promise-in-callback` heuristic mistake this override for a
54
- * Node-style error-first callback and flag the awaited handler below.
55
- */
56
- catch(commandError: unknown): Promise<void>;
57
- protected setup(): Promise<void>;
58
- protected abstract run(): number | Promise<number | void> | void;
59
- }
package/dist/Command.js DELETED
@@ -1,87 +0,0 @@
1
- import { Command as ClipanionCommand } from 'clipanion';
2
- import { defineScope } from '@nzyme/ioc/ContainerScope.js';
3
- import { Logger } from '@nzyme/logging/Logger.js';
4
- import { PrettyCliLoggerTransport } from '@nzyme/logging/PrettyCliLoggerTransport.js';
5
- import { createEventEmitter } from '@nzyme/utils/createEventEmitter.js';
6
- import { getClassName } from '@nzyme/utils/getClassName.js';
7
- /** Scope identifier for command-level IoC container isolation. */
8
- export const CommandScope = defineScope('command');
9
- /** Base class for CLI commands with IoC container, logging, and lifecycle events. */
10
- export class Command extends ClipanionCommand {
11
- /**
12
- * Event emitter for the before run event
13
- */
14
- get beforeRun() {
15
- return this.beforeRunEvent.event;
16
- }
17
- /**
18
- * Event emitter for the after run event
19
- */
20
- get afterRun() {
21
- return this.afterRunEvent.event;
22
- }
23
- /**
24
- * Event emitter for the cleanup event
25
- */
26
- get cleanup() {
27
- return this.cleanupEvent.event;
28
- }
29
- /** The command's scoped IoC container. Throws if accessed before setup. */
30
- get container() {
31
- if (!this.#container) {
32
- throw new Error('Not initialized yet');
33
- }
34
- return this.#container;
35
- }
36
- /** The command's logger instance. Throws if accessed before setup. */
37
- get logger() {
38
- if (!this.#logger) {
39
- throw new Error('Not initialized yet');
40
- }
41
- return this.#logger;
42
- }
43
- beforeRunEvent = createEventEmitter();
44
- afterRunEvent = createEventEmitter();
45
- cleanupEvent = createEventEmitter();
46
- #container = null;
47
- #logger = null;
48
- /** Runs the command lifecycle: setup, beforeRun, run, afterRun, cleanup. */
49
- async execute() {
50
- await this.setup();
51
- try {
52
- await this.beforeRunEvent.emitAsync();
53
- const result = await this.run();
54
- await this.afterRunEvent.emitAsync();
55
- return result;
56
- }
57
- finally {
58
- await this.cleanupEvent.emitAsync();
59
- }
60
- }
61
- /**
62
- * Logs the error and exits the process with code 1. The error is first passed through the
63
- * context's `onError` handler, so one handler set on `execute()` covers every command — clipanion
64
- * routes every command failure through `catch()`, making it the single place to apply it.
65
- * Parameter is intentionally not named `error`/`err` — that shape makes
66
- * eslint-plugin-promise's `no-promise-in-callback` heuristic mistake this override for a
67
- * Node-style error-first callback and flag the awaited handler below.
68
- */
69
- async catch(commandError) {
70
- const reported = (await this.context.onError?.(commandError)) ?? commandError;
71
- if (this.#logger) {
72
- this.#logger.error('❌ Command execution failed', { error: reported });
73
- }
74
- else {
75
- console.error('❌ Command execution failed', { error: reported });
76
- }
77
- process.exit(1);
78
- }
79
- setup() {
80
- this.#container = this.context.container.createChild(CommandScope);
81
- this.#container.register(PrettyCliLoggerTransport);
82
- const transport = this.#container.resolve(PrettyCliLoggerTransport);
83
- this.#logger = Logger.create({ name: getClassName(this), transport });
84
- return Promise.resolve();
85
- }
86
- }
87
- //# sourceMappingURL=Command.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"Command.js","sourceRoot":"","sources":["../src/Command.ts"],"names":[],"mappings":"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"}