@avijs/cli 0.2.1 → 0.3.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 (12) hide show
  1. package/dist/cli.d.ts.map +1 -1
  2. package/dist/cli.js +5 -1
  3. package/dist/cli.js.map +1 -1
  4. package/dist/generate.d.ts.map +1 -1
  5. package/dist/generate.js +3 -0
  6. package/dist/generate.js.map +1 -1
  7. package/dist/templates.js +65 -25
  8. package/dist/templates.js.map +1 -1
  9. package/package.json +2 -2
  10. package/src/cli.ts +5 -1
  11. package/src/generate.ts +3 -0
  12. package/src/templates.ts +72 -25
package/dist/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AA6BA,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBnE"}
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"}
package/dist/cli.js CHANGED
@@ -23,7 +23,10 @@ ${GENERATE_USAGE}
23
23
  avi check [--project tsconfig.json]
24
24
  Type-check every static inject list.
25
25
  avi manifest <entry.js> [--export AppModule] [--out avi.manifest.json]
26
- Describe the app's modules, providers and routes.`;
26
+ Describe the app's modules, providers and routes.
27
+ avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check]
28
+ Generate the typed Api for @avijs/client from the app's routes. --check fails when the
29
+ file is out of date, for CI.`;
27
30
  export async function main(argv) {
28
31
  const [command, ...rest] = argv;
29
32
  switch (command) {
@@ -36,6 +39,7 @@ export async function main(argv) {
36
39
  return dev(rest);
37
40
  case 'check':
38
41
  case 'manifest':
42
+ case 'client':
39
43
  return compile(argv);
40
44
  default:
41
45
  console.error(USAGE);
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.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,cAAc,kiBAKuD,CAAC;AAiDnF,wBAAsB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA4DvE"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,cAAc,kiBAKuD,CAAC;AAiDnF,wBAAsB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CA+DvE"}
package/dist/generate.js CHANGED
@@ -109,6 +109,9 @@ export async function generate(args) {
109
109
  console.error(error.message);
110
110
  return 1;
111
111
  }
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.');
114
+ }
112
115
  await plan.apply(root, values['dry-run']);
113
116
  return 0;
114
117
  }
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
@@ -23,6 +23,7 @@ function shared({ name, template, aviVersion, localPackages }, validator) {
23
23
  start: 'node dist/main.js',
24
24
  dev: 'avi dev',
25
25
  check: 'avi check',
26
+ client: 'avi client',
26
27
  test: 'tsc && node --test "dist/**/*.test.js"',
27
28
  },
28
29
  dependencies: {
@@ -66,16 +67,29 @@ npm install
66
67
  npm run dev # compile and restart on change
67
68
  npm test # compile and run the tests
68
69
  npm start # run the compiled app
70
+ npm run client # regenerate src/api.gen.ts, the typed API for @avijs/client
69
71
  \`\`\`
70
72
 
71
73
  Then open http://localhost:3000/health and http://localhost:3000/users.
72
74
  `,
73
75
  };
74
76
  }
77
+ /** What `avi client` writes for a template; a CLI test checks they match. */
78
+ function apiFile(imports, routes) {
79
+ return [
80
+ '// Generated by `avi client`. Do not edit: run it again after changing routes.',
81
+ `import type { ${imports[0]?.[0] ?? ''} } from '@avijs/core';`,
82
+ ...imports.map(([, name, from]) => `import type { ${name} } from '${from}';`),
83
+ '',
84
+ 'export interface Api {',
85
+ ...routes.map((route) => ` ${route};`),
86
+ '}',
87
+ '',
88
+ ].join('\n');
89
+ }
75
90
  const MAIN_LISTEN = listenOn("Number(process.env['PORT'] ?? 3000)");
76
91
  function listenOn(port) {
77
- return `const { port } = await app.listen(${port});
78
- console.log(\`Listening on http://localhost:\${String(port)}\`);
92
+ return `await app.listen(${port});
79
93
 
80
94
  const shutdown = () => {
81
95
  void app.close().then(() => process.exit(0));
@@ -97,6 +111,15 @@ export const Config = defineConfig(env, { envFile: '.env' });
97
111
  }
98
112
  function modular() {
99
113
  return {
114
+ 'src/api.gen.ts': apiFile([
115
+ ['MethodEndpoint', 'HealthController', './common/health.controller.js'],
116
+ ['MethodEndpoint', 'UsersController', './modules/users/users.controller.js'],
117
+ ], [
118
+ "'GET /health': MethodEndpoint<'/health', HealthController['check']>",
119
+ "'GET /users': MethodEndpoint<'/users', UsersController['findAll']>",
120
+ "'POST /users': MethodEndpoint<'/users', UsersController['create']>",
121
+ "'GET /users/:id': MethodEndpoint<'/users/:id', UsersController['findOne']>",
122
+ ]),
100
123
  'src/main.ts': `import { AviFactory } from '@avijs/core';
101
124
  import { AppModule } from './app.module.js';
102
125
 
@@ -136,7 +159,7 @@ export interface User {
136
159
 
137
160
  @Injectable()
138
161
  export class UsersService {
139
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
162
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
140
163
 
141
164
  findAll(): User[] {
142
165
  return this.#users;
@@ -197,18 +220,20 @@ export function parseCreateUser(input: unknown): CreateUserDto | undefined {
197
220
  'src/modules/users/users.test.ts': `import assert from 'node:assert/strict';
198
221
  import { after, before, test } from 'node:test';
199
222
  import { createTestClient, type TestClient } from '@avijs/testing';
223
+ import type { Api } from '../../api.gen.js';
200
224
  import { AppModule } from '../../app.module.js';
201
225
 
202
- let client: TestClient;
226
+ let client: TestClient<Api>;
203
227
  before(async () => {
204
- client = await createTestClient(AppModule);
228
+ client = await createTestClient<Api>(AppModule);
205
229
  });
206
230
  after(() => client.close());
207
231
 
208
232
  test('lists users', async () => {
209
- const res = await client.get('/users');
210
- assert.equal(res.status, 200);
211
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
233
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
234
+ const res = await client.api.get('/users');
235
+ assert.ok(res.ok);
236
+ assert.equal(res.body[0]?.name, 'Shiela');
212
237
  });
213
238
 
214
239
  test('creates a user', async () => {
@@ -225,6 +250,15 @@ test('rejects a user without a name', async () => {
225
250
  }
226
251
  function minimal() {
227
252
  return {
253
+ 'src/api.gen.ts': apiFile([
254
+ ['RouteEndpoint', 'healthRoutes', './routes/health.js'],
255
+ ['RouteEndpoint', 'usersRoutes', './routes/users.js'],
256
+ ], [
257
+ "'GET /health': RouteEndpoint<'/health', typeof healthRoutes, 0>",
258
+ "'GET /users': RouteEndpoint<'/users', typeof usersRoutes, 0>",
259
+ "'POST /users': RouteEndpoint<'/users', typeof usersRoutes, 2>",
260
+ "'GET /users/:id': RouteEndpoint<'/users/:id', typeof usersRoutes, 1>",
261
+ ]),
228
262
  'src/main.ts': `import { createApp } from './app.js';
229
263
 
230
264
  const app = createApp();
@@ -284,7 +318,7 @@ export const usersRoutes = defineController({
284
318
  }
285
319
 
286
320
  export class UsersService {
287
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
321
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
288
322
 
289
323
  findAll(): User[] {
290
324
  return this.#users;
@@ -304,18 +338,20 @@ export class UsersService {
304
338
  'src/app.test.ts': `import assert from 'node:assert/strict';
305
339
  import { after, before, test } from 'node:test';
306
340
  import { createTestClient, type TestClient } from '@avijs/testing';
341
+ import type { Api } from './api.gen.js';
307
342
  import { createApp } from './app.js';
308
343
 
309
- let client: TestClient;
344
+ let client: TestClient<Api>;
310
345
  before(async () => {
311
- client = await createTestClient(createApp());
346
+ client = await createTestClient<Api>(createApp());
312
347
  });
313
348
  after(() => client.close());
314
349
 
315
350
  test('lists users', async () => {
316
- const res = await client.get('/users');
317
- assert.equal(res.status, 200);
318
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
351
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
352
+ const res = await client.api.get('/users');
353
+ assert.ok(res.ok);
354
+ assert.equal(res.body[0]?.name, 'Shiela');
319
355
  });
320
356
 
321
357
  test('creates a user', async () => {
@@ -379,7 +415,7 @@ import type { CreateUserDto, User } from './dto/user.dto.js';
379
415
 
380
416
  @Injectable()
381
417
  export class UsersService {
382
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
418
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
383
419
 
384
420
  findAll(): User[] {
385
421
  return this.#users;
@@ -438,18 +474,20 @@ export class UsersController {
438
474
  'src/modules/users/users.test.ts': `import assert from 'node:assert/strict';
439
475
  import { after, before, test } from 'node:test';
440
476
  import { createTestClient, type TestClient } from '@avijs/testing';
477
+ import type { Api } from '../../api.gen.js';
441
478
  import { AppModule } from '../../app.module.js';
442
479
 
443
- let client: TestClient;
480
+ let client: TestClient<Api>;
444
481
  before(async () => {
445
- client = await createTestClient(AppModule);
482
+ client = await createTestClient<Api>(AppModule);
446
483
  });
447
484
  after(() => client.close());
448
485
 
449
486
  test('lists users', async () => {
450
- const res = await client.get('/users');
451
- assert.equal(res.status, 200);
452
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
487
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
488
+ const res = await client.api.get('/users');
489
+ assert.ok(res.ok);
490
+ assert.equal(res.body[0]?.name, 'Shiela');
453
491
  });
454
492
 
455
493
  test('creates a user', async () => {
@@ -530,18 +568,20 @@ export const usersRoutes = defineController({
530
568
  'src/app.test.ts': `import assert from 'node:assert/strict';
531
569
  import { after, before, test } from 'node:test';
532
570
  import { createTestClient, type TestClient } from '@avijs/testing';
571
+ import type { Api } from './api.gen.js';
533
572
  import { createApp } from './app.js';
534
573
 
535
- let client: TestClient;
574
+ let client: TestClient<Api>;
536
575
  before(async () => {
537
- client = await createTestClient(createApp());
576
+ client = await createTestClient<Api>(createApp());
538
577
  });
539
578
  after(() => client.close());
540
579
 
541
580
  test('lists users', async () => {
542
- const res = await client.get('/users');
543
- assert.equal(res.status, 200);
544
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
581
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
582
+ const res = await client.api.get('/users');
583
+ assert.ok(res.ok);
584
+ assert.equal(res.body[0]?.name, 'Shiela');
545
585
  });
546
586
 
547
587
  test('creates a user', async () => {
package/dist/templates.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAqC,MAAM,iBAAiB,CAAC;AAmBhG,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAAC,OAAwB;IACpD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IACjD,MAAM,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACrE,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,MAAM,CACX,KAAK,EACL,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CACjF,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC/F,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,MAAM,CACb,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAmB,EAC9D,SAAoB;IAEpB,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC;IACjE,MAAM,GAAG,GAAG;QACV,IAAI;QACJ,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,mBAAmB;YAC1B,GAAG,EAAE,SAAS;YACd,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,wCAAwC;SAC/C;QACD,YAAY,EAAE;YACZ,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC;YAClC,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;SAChF;QACD,eAAe,EAAE;YACf,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC;YAChC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC;YACxC,aAAa,EAAE,SAAS;YACxB,UAAU,EAAE,QAAQ;SACrB;QACD,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC5B,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,eAAe,EAAE;YACf,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,CAAC,QAAQ,EAAE,mBAAmB,CAAC;YACpC,MAAM,EAAE,UAAU;YAClB,gBAAgB,EAAE,UAAU;YAC5B,KAAK,EAAE,CAAC,MAAM,CAAC;YACf,MAAM,EAAE,IAAI;YACZ,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,OAAO,EAAE,CAAC,KAAK,CAAC;KACjB,CAAC;IACF,OAAO;QACL,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;QACnD,eAAe,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;QACzD,YAAY,EAAE,8BAA8B;QAC5C,WAAW,EAAE,KAAK,IAAI;;4DAEkC,QAAQ;;;;;;;;;;CAUnE;KACE,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,QAAQ,CAAC,qCAAqC,CAAC,CAAC;AAEpE,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,qCAAqC,IAAI;;;;;;;;CAQjD,CAAC;AACF,CAAC;AAED,iEAAiE;AACjE,SAAS,UAAU,CAAC,MAAoB;IACtC,OAAO;EACP,MAAM,CAAC,MAAM;;;cAGD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;;;CAGnD,CAAC;AACF,CAAC;AAED,SAAS,OAAO;IACd,OAAO;QACL,aAAa,EAAE;;;;EAIjB,WAAW,EAAE;QACX,mBAAmB,EAAE;;;;;;CAMxB;QACG,iCAAiC,EAAE;;;;;;;;;CAStC;QACG,mCAAmC,EAAE;;;;;;CAMxC;QACG,oCAAoC,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BzC;QACG,uCAAuC,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B5C;QACG,0CAA0C,EAAE;;;;;;;;;;CAU/C;QACG,iCAAiC,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BtC;KACE,CAAC;AACJ,CAAC;AAED,SAAS,OAAO;IACd,OAAO;QACL,aAAa,EAAE;;;EAGjB,WAAW,EAAE;QACX,YAAY,EAAE;;;;;;;;;;;CAWjB;QACG,sBAAsB,EAAE;;;;;CAK3B;QACG,qBAAqB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8B1B;QACG,uBAAuB,EAAE;;;;;;;;;;;;;;;;;;;;;;CAsB5B;QACG,iBAAiB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BtB;KACE,CAAC;AACJ,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;CASxB,CAAC;AAEF,4EAA4E;AAC5E,SAAS,cAAc,CAAC,MAAoB;IAC1C,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC;QACnC,aAAa,EAAE;;;;;EAKjB,QAAQ,CAAC,sBAAsB,CAAC,EAAE;QAChC,mBAAmB,EAAE;;;;;;;CAOxB;QACG,mCAAmC,EAAE,GAAG,MAAM,CAAC,MAAM;;wBAEjC,MAAM,CAAC,EAAE;;+BAEF,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;8BAChE,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;;;sBAGrC,MAAM,CAAC,MAAM,CAAC;YAC9B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;YACrB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;SACxB,CAAC;qBACe,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;;0BAEf,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;CAC7C;QACG,oCAAoC,EAAE;;;;;;;;;;;;;;;;;;;;;CAqBzC;QACG,uCAAuC,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsC5C;QACG,iCAAiC,EAAE;;;;;;;;;;;;;;;;;;;;;;;EAuBrC,gBAAgB,EAAE;KACjB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,MAAoB;IAC1C,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC;QACnC,aAAa,EAAE;;;;;EAKjB,QAAQ,CAAC,sBAAsB,CAAC,EAAE;QAChC,YAAY,EAAE;;;;;;;;;;;;;CAajB;QACG,qBAAqB,EAAE;EACzB,MAAM,CAAC,MAAM;;;iBAGE,MAAM,CAAC,EAAE;;qBAEL,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;;;eAGrE,MAAM,CAAC,MAAM,CAAC;YACvB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;YACrB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;SACxB,CAAC;;;;;;;;;4BASsB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;CAqB/C;QACG,iBAAiB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BrB,gBAAgB,EAAE;KACjB,CAAC;AACJ,CAAC"}
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.2.1",
3
+ "version": "0.3.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.2.1"
47
+ "@avijs/compiler": "0.3.0"
48
48
  },
49
49
  "peerDependencies": {
50
50
  "typescript": ">=5.8"
package/src/cli.ts CHANGED
@@ -25,7 +25,10 @@ ${GENERATE_USAGE}
25
25
  avi check [--project tsconfig.json]
26
26
  Type-check every static inject list.
27
27
  avi manifest <entry.js> [--export AppModule] [--out avi.manifest.json]
28
- Describe the app's modules, providers and routes.`;
28
+ Describe the app's modules, providers and routes.
29
+ avi client [--out src/api.gen.ts] [--project tsconfig.json] [--root file.ts#AppModule] [--check]
30
+ Generate the typed Api for @avijs/client from the app's routes. --check fails when the
31
+ file is out of date, for CI.`;
29
32
 
30
33
  export async function main(argv: readonly string[]): Promise<number> {
31
34
  const [command, ...rest] = argv;
@@ -39,6 +42,7 @@ export async function main(argv: readonly string[]): Promise<number> {
39
42
  return dev(rest);
40
43
  case 'check':
41
44
  case 'manifest':
45
+ case 'client':
42
46
  return compile(argv);
43
47
  default:
44
48
  console.error(USAGE);
package/src/generate.ts CHANGED
@@ -138,6 +138,9 @@ export async function generate(args: readonly string[]): Promise<number> {
138
138
  console.error(error.message);
139
139
  return 1;
140
140
  }
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.');
143
+ }
141
144
  await plan.apply(root, values['dry-run']);
142
145
  return 0;
143
146
  }
package/src/templates.ts CHANGED
@@ -47,6 +47,7 @@ function shared(
47
47
  start: 'node dist/main.js',
48
48
  dev: 'avi dev',
49
49
  check: 'avi check',
50
+ client: 'avi client',
50
51
  test: 'tsc && node --test "dist/**/*.test.js"',
51
52
  },
52
53
  dependencies: {
@@ -90,6 +91,7 @@ npm install
90
91
  npm run dev # compile and restart on change
91
92
  npm test # compile and run the tests
92
93
  npm start # run the compiled app
94
+ npm run client # regenerate src/api.gen.ts, the typed API for @avijs/client
93
95
  \`\`\`
94
96
 
95
97
  Then open http://localhost:3000/health and http://localhost:3000/users.
@@ -97,11 +99,24 @@ Then open http://localhost:3000/health and http://localhost:3000/users.
97
99
  };
98
100
  }
99
101
 
102
+ /** What `avi client` writes for a template; a CLI test checks they match. */
103
+ function apiFile(imports: [string, string, string][], routes: string[]): string {
104
+ return [
105
+ '// Generated by `avi client`. Do not edit: run it again after changing routes.',
106
+ `import type { ${imports[0]?.[0] ?? ''} } from '@avijs/core';`,
107
+ ...imports.map(([, name, from]) => `import type { ${name} } from '${from}';`),
108
+ '',
109
+ 'export interface Api {',
110
+ ...routes.map((route) => ` ${route};`),
111
+ '}',
112
+ '',
113
+ ].join('\n');
114
+ }
115
+
100
116
  const MAIN_LISTEN = listenOn("Number(process.env['PORT'] ?? 3000)");
101
117
 
102
118
  function listenOn(port: string): string {
103
- return `const { port } = await app.listen(${port});
104
- console.log(\`Listening on http://localhost:\${String(port)}\`);
119
+ return `await app.listen(${port});
105
120
 
106
121
  const shutdown = () => {
107
122
  void app.close().then(() => process.exit(0));
@@ -125,6 +140,18 @@ export const Config = defineConfig(env, { envFile: '.env' });
125
140
 
126
141
  function modular(): Record<string, string> {
127
142
  return {
143
+ 'src/api.gen.ts': apiFile(
144
+ [
145
+ ['MethodEndpoint', 'HealthController', './common/health.controller.js'],
146
+ ['MethodEndpoint', 'UsersController', './modules/users/users.controller.js'],
147
+ ],
148
+ [
149
+ "'GET /health': MethodEndpoint<'/health', HealthController['check']>",
150
+ "'GET /users': MethodEndpoint<'/users', UsersController['findAll']>",
151
+ "'POST /users': MethodEndpoint<'/users', UsersController['create']>",
152
+ "'GET /users/:id': MethodEndpoint<'/users/:id', UsersController['findOne']>",
153
+ ],
154
+ ),
128
155
  'src/main.ts': `import { AviFactory } from '@avijs/core';
129
156
  import { AppModule } from './app.module.js';
130
157
 
@@ -164,7 +191,7 @@ export interface User {
164
191
 
165
192
  @Injectable()
166
193
  export class UsersService {
167
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
194
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
168
195
 
169
196
  findAll(): User[] {
170
197
  return this.#users;
@@ -225,18 +252,20 @@ export function parseCreateUser(input: unknown): CreateUserDto | undefined {
225
252
  'src/modules/users/users.test.ts': `import assert from 'node:assert/strict';
226
253
  import { after, before, test } from 'node:test';
227
254
  import { createTestClient, type TestClient } from '@avijs/testing';
255
+ import type { Api } from '../../api.gen.js';
228
256
  import { AppModule } from '../../app.module.js';
229
257
 
230
- let client: TestClient;
258
+ let client: TestClient<Api>;
231
259
  before(async () => {
232
- client = await createTestClient(AppModule);
260
+ client = await createTestClient<Api>(AppModule);
233
261
  });
234
262
  after(() => client.close());
235
263
 
236
264
  test('lists users', async () => {
237
- const res = await client.get('/users');
238
- assert.equal(res.status, 200);
239
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
265
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
266
+ const res = await client.api.get('/users');
267
+ assert.ok(res.ok);
268
+ assert.equal(res.body[0]?.name, 'Shiela');
240
269
  });
241
270
 
242
271
  test('creates a user', async () => {
@@ -254,6 +283,18 @@ test('rejects a user without a name', async () => {
254
283
 
255
284
  function minimal(): Record<string, string> {
256
285
  return {
286
+ 'src/api.gen.ts': apiFile(
287
+ [
288
+ ['RouteEndpoint', 'healthRoutes', './routes/health.js'],
289
+ ['RouteEndpoint', 'usersRoutes', './routes/users.js'],
290
+ ],
291
+ [
292
+ "'GET /health': RouteEndpoint<'/health', typeof healthRoutes, 0>",
293
+ "'GET /users': RouteEndpoint<'/users', typeof usersRoutes, 0>",
294
+ "'POST /users': RouteEndpoint<'/users', typeof usersRoutes, 2>",
295
+ "'GET /users/:id': RouteEndpoint<'/users/:id', typeof usersRoutes, 1>",
296
+ ],
297
+ ),
257
298
  'src/main.ts': `import { createApp } from './app.js';
258
299
 
259
300
  const app = createApp();
@@ -313,7 +354,7 @@ export const usersRoutes = defineController({
313
354
  }
314
355
 
315
356
  export class UsersService {
316
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
357
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
317
358
 
318
359
  findAll(): User[] {
319
360
  return this.#users;
@@ -333,18 +374,20 @@ export class UsersService {
333
374
  'src/app.test.ts': `import assert from 'node:assert/strict';
334
375
  import { after, before, test } from 'node:test';
335
376
  import { createTestClient, type TestClient } from '@avijs/testing';
377
+ import type { Api } from './api.gen.js';
336
378
  import { createApp } from './app.js';
337
379
 
338
- let client: TestClient;
380
+ let client: TestClient<Api>;
339
381
  before(async () => {
340
- client = await createTestClient(createApp());
382
+ client = await createTestClient<Api>(createApp());
341
383
  });
342
384
  after(() => client.close());
343
385
 
344
386
  test('lists users', async () => {
345
- const res = await client.get('/users');
346
- assert.equal(res.status, 200);
347
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
387
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
388
+ const res = await client.api.get('/users');
389
+ assert.ok(res.ok);
390
+ assert.equal(res.body[0]?.name, 'Shiela');
348
391
  });
349
392
 
350
393
  test('creates a user', async () => {
@@ -410,7 +453,7 @@ import type { CreateUserDto, User } from './dto/user.dto.js';
410
453
 
411
454
  @Injectable()
412
455
  export class UsersService {
413
- readonly #users: User[] = [{ id: 1, name: 'Ada' }];
456
+ readonly #users: User[] = [{ id: 1, name: 'Shiela' }];
414
457
 
415
458
  findAll(): User[] {
416
459
  return this.#users;
@@ -469,18 +512,20 @@ export class UsersController {
469
512
  'src/modules/users/users.test.ts': `import assert from 'node:assert/strict';
470
513
  import { after, before, test } from 'node:test';
471
514
  import { createTestClient, type TestClient } from '@avijs/testing';
515
+ import type { Api } from '../../api.gen.js';
472
516
  import { AppModule } from '../../app.module.js';
473
517
 
474
- let client: TestClient;
518
+ let client: TestClient<Api>;
475
519
  before(async () => {
476
- client = await createTestClient(AppModule);
520
+ client = await createTestClient<Api>(AppModule);
477
521
  });
478
522
  after(() => client.close());
479
523
 
480
524
  test('lists users', async () => {
481
- const res = await client.get('/users');
482
- assert.equal(res.status, 200);
483
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
525
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
526
+ const res = await client.api.get('/users');
527
+ assert.ok(res.ok);
528
+ assert.equal(res.body[0]?.name, 'Shiela');
484
529
  });
485
530
 
486
531
  test('creates a user', async () => {
@@ -562,18 +607,20 @@ export const usersRoutes = defineController({
562
607
  'src/app.test.ts': `import assert from 'node:assert/strict';
563
608
  import { after, before, test } from 'node:test';
564
609
  import { createTestClient, type TestClient } from '@avijs/testing';
610
+ import type { Api } from './api.gen.js';
565
611
  import { createApp } from './app.js';
566
612
 
567
- let client: TestClient;
613
+ let client: TestClient<Api>;
568
614
  before(async () => {
569
- client = await createTestClient(createApp());
615
+ client = await createTestClient<Api>(createApp());
570
616
  });
571
617
  after(() => client.close());
572
618
 
573
619
  test('lists users', async () => {
574
- const res = await client.get('/users');
575
- assert.equal(res.status, 200);
576
- assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
620
+ // client.api is typed from src/api.gen.ts: paths, params, bodies and responses.
621
+ const res = await client.api.get('/users');
622
+ assert.ok(res.ok);
623
+ assert.equal(res.body[0]?.name, 'Shiela');
577
624
  });
578
625
 
579
626
  test('creates a user', async () => {