@avijs/cli 0.5.2 → 0.6.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 (11) hide show
  1. package/dist/cli.d.ts.map +1 -1
  2. package/dist/cli.js +68 -42
  3. package/dist/cli.js.map +1 -1
  4. package/dist/generate.js +1 -1
  5. package/dist/generate.js.map +1 -1
  6. package/dist/templates.js +8 -5
  7. package/dist/templates.js.map +1 -1
  8. package/package.json +2 -2
  9. package/src/cli.ts +68 -40
  10. package/src/generate.ts +1 -1
  11. package/src/templates.ts +8 -5
package/dist/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAgCA,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBnE"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAoCA,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBnE"}
package/dist/cli.js CHANGED
@@ -1,5 +1,5 @@
1
- import { main as compile } from '@avijs/compiler';
2
- import { spawn, spawnSync } from 'node:child_process';
1
+ import { buildProject, main as compile, watchProject } from '@avijs/compiler';
2
+ import { spawn } from 'node:child_process';
3
3
  import { existsSync } from 'node:fs';
4
4
  import { mkdir, readdir, writeFile } from 'node:fs/promises';
5
5
  import { createRequire } from 'node:module';
@@ -18,15 +18,19 @@ const USAGE = `Usage:
18
18
  a folder of packed @avijs tarballs (pnpm pack) to install instead of the registry.
19
19
  --avi-version defaults to this CLI's version.
20
20
  ${GENERATE_USAGE}
21
- avi dev [--project tsconfig.json] [--entry dist/main.js]
22
- Compile, then recompile and restart on every change.
21
+ avi dev [--project tsconfig.json] [--entry dist/main.js] [--client src/api.gen.ts | --no-client]
22
+ Compile, then recompile and restart on every change. Keeps src/api.gen.ts (when the
23
+ project has one) in step with the routes.
24
+ avi build [--project tsconfig.json] [--client src/api.gen.ts | --no-client]
25
+ Update src/api.gen.ts, empty the output folder, and compile, so files deleted from
26
+ src do not linger in dist.
23
27
  avi check [--project tsconfig.json]
24
28
  Type-check every static inject list.
25
29
  avi manifest <entry.js> [--export AppModule] [--out avi.manifest.json]
26
30
  Describe the app's modules, providers and routes.
27
- avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check]
31
+ avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check | --watch]
28
32
  Generate the typed Api for @avijs/client from the app's routes. --check fails when the
29
- file is out of date, for CI.`;
33
+ file is out of date, for CI; --watch updates it on every change.`;
30
34
  export async function main(argv) {
31
35
  const [command, ...rest] = argv;
32
36
  switch (command) {
@@ -37,6 +41,8 @@ export async function main(argv) {
37
41
  return generate(rest);
38
42
  case 'dev':
39
43
  return dev(rest);
44
+ case 'build':
45
+ return build(rest);
40
46
  case 'check':
41
47
  case 'manifest':
42
48
  case 'client':
@@ -104,51 +110,71 @@ async function dev(args) {
104
110
  options: {
105
111
  project: { type: 'string', default: 'tsconfig.json' },
106
112
  entry: { type: 'string', default: 'dist/main.js' },
113
+ client: { type: 'string' },
114
+ 'no-client': { type: 'boolean', default: false },
107
115
  'dry-run': { type: 'boolean', default: false },
108
116
  },
109
117
  });
110
- let tsc;
111
- try {
112
- tsc = createRequire(path.resolve('package.json')).resolve('typescript/bin/tsc');
113
- }
114
- catch {
115
- console.error('avi dev needs TypeScript installed in this project: npm install -D typescript');
116
- return 1;
117
- }
118
- const build = [tsc, '-p', values.project];
119
- const watchBuild = [tsc, '-p', values.project, '--watch', '--preserveWatchOutput'];
120
- const watchRun = ['--watch', '--watch-preserve-output', values.entry];
118
+ const client = clientFile(values.project, values.client, values['no-client']);
119
+ const run = ['--watch', '--watch-preserve-output', values.entry];
121
120
  if (values['dry-run']) {
122
- for (const command of [build, watchBuild, watchRun]) {
123
- console.log(['node', ...command].join(' '));
124
- }
121
+ console.log(`watch ${values.project}${client ? `, updating ${client} when routes change` : ''}`);
122
+ console.log(['node', ...run].join(' '));
125
123
  return 0;
126
124
  }
127
- const first = spawnSync(process.execPath, build, { stdio: 'inherit' });
128
- if (first.status !== 0)
129
- return first.status ?? 1;
130
- const children = [
131
- spawn(process.execPath, watchBuild, { stdio: 'inherit' }),
132
- spawn(process.execPath, watchRun, { stdio: 'inherit' }),
133
- ];
134
125
  return new Promise((resolve) => {
135
- const stop = () => {
136
- for (const child of children)
137
- child.kill();
138
- resolve(0);
126
+ let app;
127
+ // The app starts after the first clean build; node --watch restarts it from then on.
128
+ const watcher = watchProject({
129
+ project: values.project,
130
+ ...(client ? { client: { out: client } } : {}),
131
+ onBuild: (errors) => {
132
+ if (errors > 0 || app)
133
+ return;
134
+ app = spawn(process.execPath, run, { stdio: 'inherit' });
135
+ app.once('exit', (code) => {
136
+ if (code !== null && code !== 0)
137
+ stop(code);
138
+ });
139
+ },
140
+ });
141
+ const stop = (code) => {
142
+ watcher.close();
143
+ app?.kill();
144
+ resolve(code);
139
145
  };
140
- process.once('SIGINT', stop);
141
- process.once('SIGTERM', stop);
142
- for (const child of children) {
143
- child.once('exit', (code) => {
144
- if (code !== null && code !== 0) {
145
- for (const other of children)
146
- other.kill();
147
- resolve(code);
148
- }
149
- });
150
- }
146
+ process.once('SIGINT', () => {
147
+ stop(0);
148
+ });
149
+ process.once('SIGTERM', () => {
150
+ stop(0);
151
+ });
152
+ });
153
+ }
154
+ function build(args) {
155
+ const { values } = parseArgs({
156
+ args: [...args],
157
+ options: {
158
+ project: { type: 'string', default: 'tsconfig.json' },
159
+ client: { type: 'string' },
160
+ 'no-client': { type: 'boolean', default: false },
161
+ },
162
+ });
163
+ const client = clientFile(values.project, values.client, values['no-client']);
164
+ const errors = buildProject({
165
+ project: values.project,
166
+ ...(client ? { client: { out: client } } : {}),
151
167
  });
168
+ return errors > 0 ? 1 : 0;
169
+ }
170
+ /** The client file to keep current: --client, else the project's src/api.gen.ts if it has one. */
171
+ function clientFile(project, client, off) {
172
+ if (off)
173
+ return undefined;
174
+ if (client)
175
+ return client;
176
+ const file = path.posix.join(path.dirname(project).replaceAll('\\', '/'), 'src/api.gen.ts');
177
+ return existsSync(file) ? file : undefined;
152
178
  }
153
179
  /** Maps each packed @avi tarball in `dir` to a `file:` spec relative to the new project. */
154
180
  async function localPackages(dir, project) {
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
package/dist/generate.js CHANGED
@@ -110,7 +110,7 @@ export async function generate(args) {
110
110
  return 1;
111
111
  }
112
112
  if ((kind === 'controller' || kind === 'resource') && existsSync(path.join(src, 'api.gen.ts'))) {
113
- plan.notes.push('Run `avi client` to add the new routes to src/api.gen.ts.');
113
+ plan.notes.push('`avi dev` adds the new routes to src/api.gen.ts; otherwise run `avi client`.');
114
114
  }
115
115
  await plan.apply(root, values['dry-run']);
116
116
  return 0;
package/dist/generate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
package/dist/templates.js CHANGED
@@ -19,12 +19,12 @@ function shared({ name, template, aviVersion, localPackages }, validator) {
19
19
  private: true,
20
20
  type: 'module',
21
21
  scripts: {
22
- build: 'tsc',
22
+ build: 'avi build',
23
23
  start: 'node dist/main.js',
24
24
  dev: 'avi dev',
25
25
  check: 'avi check',
26
26
  client: 'avi client',
27
- test: 'tsc && node --test "dist/**/*.test.js"',
27
+ test: 'avi build && node --test "dist/**/*.test.js"',
28
28
  },
29
29
  dependencies: {
30
30
  '@avijs/core': spec('@avijs/core'),
@@ -51,6 +51,7 @@ function shared({ name, template, aviVersion, localPackages }, validator) {
51
51
  outDir: 'dist',
52
52
  rootDir: 'src',
53
53
  sourceMap: true,
54
+ declaration: true,
54
55
  },
55
56
  include: ['src'],
56
57
  };
@@ -67,7 +68,7 @@ npm install
67
68
  npm run dev # compile and restart on change
68
69
  npm test # compile and run the tests
69
70
  npm start # run the compiled app
70
- npm run client # regenerate src/api.gen.ts, the typed API for @avijs/client
71
+ npm run client # update src/api.gen.ts, the typed API for @avijs/client (avi dev does it on save)
71
72
  \`\`\`
72
73
 
73
74
  Then open http://localhost:3000/health and http://localhost:3000/users.
@@ -77,7 +78,7 @@ Then open http://localhost:3000/health and http://localhost:3000/users.
77
78
  /** What `avi client` writes for a template; a CLI test checks they match. */
78
79
  function apiFile(imports, routes) {
79
80
  return [
80
- '// Generated by `avi client`. Do not edit: run it again after changing routes.',
81
+ '// Generated by `avi client`; `avi dev` keeps it up to date. Do not edit.',
81
82
  `import type { ${imports[0]?.[0] ?? ''} } from '@avijs/core';`,
82
83
  ...imports.map(([, name, from]) => `import type { ${name} } from '${from}';`),
83
84
  '',
@@ -100,13 +101,15 @@ process.once('SIGTERM', shutdown);
100
101
  }
101
102
  /** `src/config.ts`: environment variables checked at startup. */
102
103
  function configFile(syntax) {
103
- return `import { defineConfig } from '@avijs/core';
104
+ return `import { defineConfig, type TokenType } from '@avijs/core';
104
105
  ${syntax.import}
105
106
 
106
107
  // Environment variables, checked when the app starts. A .env file is read too, if present.
107
108
  const env = ${syntax.object([['PORT', syntax.port]])};
108
109
 
109
110
  export const Config = defineConfig(env, { envFile: '.env' });
111
+ // The validated values, to type an injected config: constructor(private readonly config: Config).
112
+ export type Config = TokenType<typeof Config>;
110
113
  `;
111
114
  }
112
115
  function modular() {
package/dist/templates.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@avijs/cli",
3
- "version": "0.5.2",
3
+ "version": "0.6.0",
4
4
  "description": "The avi command: project scaffolding, dev mode and build checks.",
5
5
  "keywords": [
6
6
  "avi",
@@ -44,7 +44,7 @@
44
44
  "access": "public"
45
45
  },
46
46
  "dependencies": {
47
- "@avijs/compiler": "0.5.2"
47
+ "@avijs/compiler": "0.6.0"
48
48
  },
49
49
  "peerDependencies": {
50
50
  "typescript": ">=5.8"
package/src/cli.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { main as compile } from '@avijs/compiler';
2
- import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
1
+ import { buildProject, main as compile, watchProject } from '@avijs/compiler';
2
+ import { spawn, type ChildProcess } from 'node:child_process';
3
3
  import { existsSync } from 'node:fs';
4
4
  import { mkdir, readdir, writeFile } from 'node:fs/promises';
5
5
  import { createRequire } from 'node:module';
@@ -20,15 +20,19 @@ const USAGE = `Usage:
20
20
  a folder of packed @avijs tarballs (pnpm pack) to install instead of the registry.
21
21
  --avi-version defaults to this CLI's version.
22
22
  ${GENERATE_USAGE}
23
- avi dev [--project tsconfig.json] [--entry dist/main.js]
24
- Compile, then recompile and restart on every change.
23
+ avi dev [--project tsconfig.json] [--entry dist/main.js] [--client src/api.gen.ts | --no-client]
24
+ Compile, then recompile and restart on every change. Keeps src/api.gen.ts (when the
25
+ project has one) in step with the routes.
26
+ avi build [--project tsconfig.json] [--client src/api.gen.ts | --no-client]
27
+ Update src/api.gen.ts, empty the output folder, and compile, so files deleted from
28
+ src do not linger in dist.
25
29
  avi check [--project tsconfig.json]
26
30
  Type-check every static inject list.
27
31
  avi manifest <entry.js> [--export AppModule] [--out avi.manifest.json]
28
32
  Describe the app's modules, providers and routes.
29
- avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check]
33
+ avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check | --watch]
30
34
  Generate the typed Api for @avijs/client from the app's routes. --check fails when the
31
- file is out of date, for CI.`;
35
+ file is out of date, for CI; --watch updates it on every change.`;
32
36
 
33
37
  export async function main(argv: readonly string[]): Promise<number> {
34
38
  const [command, ...rest] = argv;
@@ -40,6 +44,8 @@ export async function main(argv: readonly string[]): Promise<number> {
40
44
  return generate(rest);
41
45
  case 'dev':
42
46
  return dev(rest);
47
+ case 'build':
48
+ return build(rest);
43
49
  case 'check':
44
50
  case 'manifest':
45
51
  case 'client':
@@ -113,53 +119,75 @@ async function dev(args: readonly string[]): Promise<number> {
113
119
  options: {
114
120
  project: { type: 'string', default: 'tsconfig.json' },
115
121
  entry: { type: 'string', default: 'dist/main.js' },
122
+ client: { type: 'string' },
123
+ 'no-client': { type: 'boolean', default: false },
116
124
  'dry-run': { type: 'boolean', default: false },
117
125
  },
118
126
  });
119
127
 
120
- let tsc: string;
121
- try {
122
- tsc = createRequire(path.resolve('package.json')).resolve('typescript/bin/tsc');
123
- } catch {
124
- console.error('avi dev needs TypeScript installed in this project: npm install -D typescript');
125
- return 1;
126
- }
127
-
128
- const build = [tsc, '-p', values.project];
129
- const watchBuild = [tsc, '-p', values.project, '--watch', '--preserveWatchOutput'];
130
- const watchRun = ['--watch', '--watch-preserve-output', values.entry];
128
+ const client = clientFile(values.project, values.client, values['no-client']);
129
+ const run = ['--watch', '--watch-preserve-output', values.entry];
131
130
  if (values['dry-run']) {
132
- for (const command of [build, watchBuild, watchRun]) {
133
- console.log(['node', ...command].join(' '));
134
- }
131
+ console.log(
132
+ `watch ${values.project}${client ? `, updating ${client} when routes change` : ''}`,
133
+ );
134
+ console.log(['node', ...run].join(' '));
135
135
  return 0;
136
136
  }
137
137
 
138
- const first = spawnSync(process.execPath, build, { stdio: 'inherit' });
139
- if (first.status !== 0) return first.status ?? 1;
140
-
141
- const children: ChildProcess[] = [
142
- spawn(process.execPath, watchBuild, { stdio: 'inherit' }),
143
- spawn(process.execPath, watchRun, { stdio: 'inherit' }),
144
- ];
145
138
  return new Promise((resolve) => {
146
- const stop = () => {
147
- for (const child of children) child.kill();
148
- resolve(0);
139
+ let app: ChildProcess | undefined;
140
+ // The app starts after the first clean build; node --watch restarts it from then on.
141
+ const watcher = watchProject({
142
+ project: values.project,
143
+ ...(client ? { client: { out: client } } : {}),
144
+ onBuild: (errors) => {
145
+ if (errors > 0 || app) return;
146
+ app = spawn(process.execPath, run, { stdio: 'inherit' });
147
+ app.once('exit', (code) => {
148
+ if (code !== null && code !== 0) stop(code);
149
+ });
150
+ },
151
+ });
152
+ const stop = (code: number) => {
153
+ watcher.close();
154
+ app?.kill();
155
+ resolve(code);
149
156
  };
150
- process.once('SIGINT', stop);
151
- process.once('SIGTERM', stop);
152
- for (const child of children) {
153
- child.once('exit', (code) => {
154
- if (code !== null && code !== 0) {
155
- for (const other of children) other.kill();
156
- resolve(code);
157
- }
158
- });
159
- }
157
+ process.once('SIGINT', () => {
158
+ stop(0);
159
+ });
160
+ process.once('SIGTERM', () => {
161
+ stop(0);
162
+ });
160
163
  });
161
164
  }
162
165
 
166
+ function build(args: readonly string[]): number {
167
+ const { values } = parseArgs({
168
+ args: [...args],
169
+ options: {
170
+ project: { type: 'string', default: 'tsconfig.json' },
171
+ client: { type: 'string' },
172
+ 'no-client': { type: 'boolean', default: false },
173
+ },
174
+ });
175
+ const client = clientFile(values.project, values.client, values['no-client']);
176
+ const errors = buildProject({
177
+ project: values.project,
178
+ ...(client ? { client: { out: client } } : {}),
179
+ });
180
+ return errors > 0 ? 1 : 0;
181
+ }
182
+
183
+ /** The client file to keep current: --client, else the project's src/api.gen.ts if it has one. */
184
+ function clientFile(project: string, client: string | undefined, off: boolean): string | undefined {
185
+ if (off) return undefined;
186
+ if (client) return client;
187
+ const file = path.posix.join(path.dirname(project).replaceAll('\\', '/'), 'src/api.gen.ts');
188
+ return existsSync(file) ? file : undefined;
189
+ }
190
+
163
191
  /** Maps each packed @avi tarball in `dir` to a `file:` spec relative to the new project. */
164
192
  async function localPackages(dir: string, project: string): Promise<Record<string, string>> {
165
193
  const folder = path.resolve(dir);
package/src/generate.ts CHANGED
@@ -139,7 +139,7 @@ export async function generate(args: readonly string[]): Promise<number> {
139
139
  return 1;
140
140
  }
141
141
  if ((kind === 'controller' || kind === 'resource') && existsSync(path.join(src, 'api.gen.ts'))) {
142
- plan.notes.push('Run `avi client` to add the new routes to src/api.gen.ts.');
142
+ plan.notes.push('`avi dev` adds the new routes to src/api.gen.ts; otherwise run `avi client`.');
143
143
  }
144
144
  await plan.apply(root, values['dry-run']);
145
145
  return 0;
package/src/templates.ts CHANGED
@@ -43,12 +43,12 @@ function shared(
43
43
  private: true,
44
44
  type: 'module',
45
45
  scripts: {
46
- build: 'tsc',
46
+ build: 'avi build',
47
47
  start: 'node dist/main.js',
48
48
  dev: 'avi dev',
49
49
  check: 'avi check',
50
50
  client: 'avi client',
51
- test: 'tsc && node --test "dist/**/*.test.js"',
51
+ test: 'avi build && node --test "dist/**/*.test.js"',
52
52
  },
53
53
  dependencies: {
54
54
  '@avijs/core': spec('@avijs/core'),
@@ -75,6 +75,7 @@ function shared(
75
75
  outDir: 'dist',
76
76
  rootDir: 'src',
77
77
  sourceMap: true,
78
+ declaration: true,
78
79
  },
79
80
  include: ['src'],
80
81
  };
@@ -91,7 +92,7 @@ npm install
91
92
  npm run dev # compile and restart on change
92
93
  npm test # compile and run the tests
93
94
  npm start # run the compiled app
94
- npm run client # regenerate src/api.gen.ts, the typed API for @avijs/client
95
+ npm run client # update src/api.gen.ts, the typed API for @avijs/client (avi dev does it on save)
95
96
  \`\`\`
96
97
 
97
98
  Then open http://localhost:3000/health and http://localhost:3000/users.
@@ -102,7 +103,7 @@ Then open http://localhost:3000/health and http://localhost:3000/users.
102
103
  /** What `avi client` writes for a template; a CLI test checks they match. */
103
104
  function apiFile(imports: [string, string, string][], routes: string[]): string {
104
105
  return [
105
- '// Generated by `avi client`. Do not edit: run it again after changing routes.',
106
+ '// Generated by `avi client`; `avi dev` keeps it up to date. Do not edit.',
106
107
  `import type { ${imports[0]?.[0] ?? ''} } from '@avijs/core';`,
107
108
  ...imports.map(([, name, from]) => `import type { ${name} } from '${from}';`),
108
109
  '',
@@ -128,13 +129,15 @@ process.once('SIGTERM', shutdown);
128
129
 
129
130
  /** `src/config.ts`: environment variables checked at startup. */
130
131
  function configFile(syntax: SchemaSyntax): string {
131
- return `import { defineConfig } from '@avijs/core';
132
+ return `import { defineConfig, type TokenType } from '@avijs/core';
132
133
  ${syntax.import}
133
134
 
134
135
  // Environment variables, checked when the app starts. A .env file is read too, if present.
135
136
  const env = ${syntax.object([['PORT', syntax.port]])};
136
137
 
137
138
  export const Config = defineConfig(env, { envFile: '.env' });
139
+ // The validated values, to type an injected config: constructor(private readonly config: Config).
140
+ export type Config = TokenType<typeof Config>;
138
141
  `;
139
142
  }
140
143