@avijs/cli 0.1.1 → 0.2.0

package/dist/templates.d.ts

@@ -1,3 +1,4 @@
+import { type Validator } from './validators.js';
 export type TemplateName = 'modular' | 'minimal';
 export interface TemplateOptions {
     name: string;
@@ -10,6 +11,8 @@ export interface TemplateOptions {
      * each other resolve locally too.
      */
     localPackages?: Readonly<Record<string, string>>;
+    /** How the users routes validate input. Default: `valibot`. */
+    validator?: Validator;
 }
 /** Every file of a new project, keyed by its path relative to the project folder. */
 export declare function templateFiles(options: TemplateOptions): Record<string, string>;

package/dist/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,YAAY,CAAC;IACvB,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAClD;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAK9E"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;AAEjD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,YAAY,CAAC;IACvB,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,+DAA+D;IAC/D,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAY9E"}

package/dist/templates.js

@@ -1,11 +1,17 @@
+import { SYNTAX, VALIDATOR_VERSIONS } from './validators.js';
 /** Every file of a new project, keyed by its path relative to the project folder. */
 export function templateFiles(options) {
-    return {
-        ...shared(options),
-        ...(options.template === 'modular' ? modular() : minimal()),
-    };
+    const validator = options.validator ?? 'valibot';
+    const syntax = validator === 'none' ? undefined : SYNTAX[validator];
+    const files = options.template === 'modular' ? modular() : minimal();
+    if (syntax) {
+        Object.assign(files, options.template === 'modular' ? modularSchemas(syntax) : minimalSchemas(syntax));
+        if (options.template === 'modular')
+            delete files['src/modules/users/dto/create-user.dto.ts'];
+    }
+    return { ...shared(options, validator), ...files };
 }
-function shared({ name, template, aviVersion, localPackages, }) {
+function shared({ name, template, aviVersion, localPackages }, validator) {
     const spec = (pkg) => localPackages?.[pkg] ?? aviVersion;
     const pkg = {
         name,
@@ -19,7 +25,10 @@ function shared({ name, template, aviVersion, localPackages, }) {
             check: 'avi check',
             test: 'tsc && node --test "dist/**/*.test.js"',
         },
-        dependencies: { '@avijs/core': spec('@avijs/core') },
+        dependencies: {
+            '@avijs/core': spec('@avijs/core'),
+            ...(validator === 'none' ? {} : { [validator]: VALIDATOR_VERSIONS[validator] }),
+        },
         devDependencies: {
             '@avijs/cli': spec('@avijs/cli'),
             '@avijs/testing': spec('@avijs/testing'),
@@ -47,7 +56,7 @@ function shared({ name, template, aviVersion, localPackages, }) {
     return {
         'package.json': `${JSON.stringify(pkg, null, 2)}\n`,
         'tsconfig.json': `${JSON.stringify(tsconfig, null, 2)}\n`,
-        '.gitignore': 'node_modules/\ndist/\n',
+        '.gitignore': 'node_modules/\ndist/\n.env\n',
         'README.md': `# ${name}
 
 An [Avi.js](https://github.com/chrischase011/avi-js) API (${template} template).
@@ -63,7 +72,9 @@ Then open http://localhost:3000/health and http://localhost:3000/users.
 `,
     };
 }
-const MAIN_LISTEN = `const { port } = await app.listen(Number(process.env['PORT'] ?? 3000));
+const MAIN_LISTEN = listenOn("Number(process.env['PORT'] ?? 3000)");
+function listenOn(port) {
+    return `const { port } = await app.listen(${port});
 console.log(\`Listening on http://localhost:\${String(port)}\`);
 
 const shutdown = () => {
@@ -72,6 +83,18 @@ const shutdown = () => {
 process.once('SIGINT', shutdown);
 process.once('SIGTERM', shutdown);
 `;
+}
+/** `src/config.ts`: environment variables checked at startup. */
+function configFile(syntax) {
+    return `import { defineConfig } from '@avijs/core';
+${syntax.import}
+
+// Environment variables, checked when the app starts. A .env file is read too, if present.
+const env = ${syntax.object([['PORT', syntax.port]])};
+
+export const Config = defineConfig(env, { envFile: '.env' });
+`;
+}
 function modular() {
     return {
         'src/main.ts': `import { AviFactory } from '@avijs/core';
@@ -307,4 +330,231 @@ test('answers 404 for an unknown user', async () => {
 `,
     };
 }
+const REJECTS_NAMELESS = `test('rejects a user without a name', async () => {
+  const res = await client.post('/users', {});
+  assert.equal(res.status, 400);
+  const body = res.body as { details: { issues: { in: string; path: string[] }[] } };
+  assert.deepEqual(
+    body.details.issues.map((issue) => \`\${issue.in}.\${issue.path.join('.')}\`),
+    ['body.name'],
+  );
+});
+`;
+/** The users feature with route schemas instead of a handwritten parser. */
+function modularSchemas(syntax) {
+    return {
+        'src/config.ts': configFile(syntax),
+        'src/main.ts': `import { AviFactory } from '@avijs/core';
+import { AppModule } from './app.module.js';
+import { Config } from './config.js';
+
+const app = await AviFactory.create(AppModule);
+${listenOn('app.get(Config).PORT')}`,
+        'src/app.module.ts': `import { Module } from '@avijs/core';
+import { HealthController } from './common/health.controller.js';
+import { Config } from './config.js';
+import { UsersModule } from './modules/users/users.module.js';
+
+@Module({ imports: [Config.module, UsersModule], controllers: [HealthController] })
+export class AppModule {}
+`,
+        'src/modules/users/dto/user.dto.ts': `${syntax.import}
+
+export const UserId = ${syntax.id};
+
+export const CreateUserDto = ${syntax.object([['name', syntax.text(100, 'name is required')]])};
+export type CreateUserDto = ${syntax.infer('CreateUserDto')};
+
+// Responses are checked against these and lose any field not listed, so internals cannot leak.
+export const User = ${syntax.object([
+            ['id', syntax.number],
+            ['name', syntax.string],
+        ])};
+export type User = ${syntax.infer('User')};
+
+export const UserList = ${syntax.array('User')};
+`,
+        'src/modules/users/users.service.ts': `import { Injectable } from '@avijs/core';
+import type { CreateUserDto, User } from './dto/user.dto.js';
+
+@Injectable()
+export class UsersService {
+  readonly #users: User[] = [{ id: 1, name: 'Ada' }];
+
+  findAll(): User[] {
+    return this.#users;
+  }
+
+  findOne(id: number): User | undefined {
+    return this.#users.find((user) => user.id === id);
+  }
+
+  create(dto: CreateUserDto): User {
+    const user = { id: this.#users.length + 1, name: dto.name };
+    this.#users.push(user);
+    return user;
+  }
+}
+`,
+        'src/modules/users/users.controller.ts': `import {
+  Controller,
+  Get,
+  HttpError,
+  Post,
+  reply,
+  type RouteContext,
+  type RouteSchema,
+} from '@avijs/core';
+import { CreateUserDto, User, UserId, UserList } from './dto/user.dto.js';
+import { UsersService } from './users.service.js';
+
+const findOne = { params: UserId, response: User } satisfies RouteSchema;
+const create = { body: CreateUserDto, response: User } satisfies RouteSchema;
+
+@Controller('/users')
+export class UsersController {
+  static inject = [UsersService] as const;
+
+  constructor(private readonly users: UsersService) {}
+
+  @Get('/', { schema: { response: UserList } })
+  findAll() {
+    return this.users.findAll();
+  }
+
+  @Get('/:id', { schema: findOne })
+  findOne(ctx: RouteContext<typeof findOne>) {
+    const user = this.users.findOne(ctx.input.params.id);
+    if (!user) throw new HttpError(404, 'User not found');
+    return user;
+  }
+
+  @Post('/', { schema: create })
+  create(ctx: RouteContext<typeof create>) {
+    return reply(this.users.create(ctx.input.body), { status: 201 });
+  }
+}
+`,
+        'src/modules/users/users.test.ts': `import assert from 'node:assert/strict';
+import { after, before, test } from 'node:test';
+import { createTestClient, type TestClient } from '@avijs/testing';
+import { AppModule } from '../../app.module.js';
+
+let client: TestClient;
+before(async () => {
+  client = await createTestClient(AppModule);
+});
+after(() => client.close());
+
+test('lists users', async () => {
+  const res = await client.get('/users');
+  assert.equal(res.status, 200);
+  assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
+});
+
+test('creates a user', async () => {
+  const res = await client.post('/users', { name: '  Grace  ', role: 'admin' });
+  assert.equal(res.status, 201);
+  assert.deepEqual(res.body, { id: 2, name: 'Grace' });
+});
+
+${REJECTS_NAMELESS}`,
+    };
+}
+function minimalSchemas(syntax) {
+    return {
+        'src/config.ts': configFile(syntax),
+        'src/main.ts': `import { createApp } from './app.js';
+import { Config } from './config.js';
+
+const app = createApp();
+await app.init();
+${listenOn('app.get(Config).PORT')}`,
+        'src/app.ts': `import { createAvi } from '@avijs/core';
+import { Config } from './config.js';
+import { healthRoutes } from './routes/health.js';
+import { usersRoutes } from './routes/users.js';
+import { UsersService } from './services/users.js';
+
+export function createApp() {
+  return createAvi().register({
+    imports: [Config.module],
+    providers: [UsersService],
+    controllers: [healthRoutes, usersRoutes],
+  });
+}
+`,
+        'src/routes/users.ts': `import { HttpError, defineController, reply, route } from '@avijs/core';
+${syntax.import}
+import { UsersService } from '../services/users.js';
+
+const UserId = ${syntax.id};
+
+const CreateUser = ${syntax.object([['name', syntax.text(100, 'name is required')]])};
+
+// Responses are checked against this and lose any field not listed, so internals cannot leak.
+const User = ${syntax.object([
+            ['id', syntax.number],
+            ['name', syntax.string],
+        ])};
+
+export const usersRoutes = defineController({
+  prefix: '/users',
+  inject: [UsersService],
+  routes: (users) => [
+    route({
+      method: 'GET',
+      path: '/',
+      schema: { response: ${syntax.array('User')} },
+      handler: () => users.findAll(),
+    }),
+    route({
+      method: 'GET',
+      path: '/:id',
+      schema: { params: UserId, response: User },
+      handler: (ctx) => {
+        const user = users.findOne(ctx.input.params.id);
+        if (!user) throw new HttpError(404, 'User not found');
+        return user;
+      },
+    }),
+    route({
+      method: 'POST',
+      path: '/',
+      schema: { body: CreateUser, response: User },
+      handler: (ctx) => reply(users.create(ctx.input.body.name), { status: 201 }),
+    }),
+  ],
+});
+`,
+        'src/app.test.ts': `import assert from 'node:assert/strict';
+import { after, before, test } from 'node:test';
+import { createTestClient, type TestClient } from '@avijs/testing';
+import { createApp } from './app.js';
+
+let client: TestClient;
+before(async () => {
+  client = await createTestClient(createApp());
+});
+after(() => client.close());
+
+test('lists users', async () => {
+  const res = await client.get('/users');
+  assert.equal(res.status, 200);
+  assert.deepEqual(res.body, [{ id: 1, name: 'Ada' }]);
+});
+
+test('creates a user', async () => {
+  const res = await client.post('/users', { name: '  Grace  ', role: 'admin' });
+  assert.equal(res.status, 201);
+  assert.deepEqual(res.body, { id: 2, name: 'Grace' });
+});
+
+test('answers 404 for an unknown user', async () => {
+  assert.equal((await client.get('/users/99')).status, 404);
+});
+
+${REJECTS_NAMELESS}`,
+    };
+}
 //# sourceMappingURL=templates.js.map

package/dist/templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"templates.js","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"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"}

package/dist/validators.d.ts

@@ -0,0 +1,27 @@
+/** Validation libraries generated code can use. `none` keeps handwritten checks. */
+export type Validator = 'valibot' | 'zod' | 'none';
+export declare const VALIDATORS: readonly Validator[];
+/** Version ranges added to a new project's dependencies. */
+export declare const VALIDATOR_VERSIONS: Record<Exclude<Validator, 'none'>, string>;
+/** How each library spells the few schemas the templates and generators need. */
+export interface SchemaSyntax {
+    readonly import: string;
+    /** Params `{ id }`: digits in, a number out. */
+    readonly id: string;
+    readonly number: string;
+    readonly string: string;
+    /** An optional `PORT` variable: digits, as a number, default 3000. */
+    readonly port: string;
+    /** A trimmed, required string of at most `max` characters. */
+    text(max: number, required: string): string;
+    object(fields: readonly (readonly [string, string])[]): string;
+    array(item: string): string;
+    /** Every field of `schema` optional, but at least one present. */
+    partialNonEmpty(schema: string): string;
+    /** The output type of `schema`. */
+    infer(schema: string): string;
+}
+export declare const SYNTAX: Record<Exclude<Validator, 'none'>, SchemaSyntax>;
+/** The validator a project already uses, from its package.json; Valibot wins over Zod. */
+export declare function detectValidator(packageJson: unknown): Validator;
+//# sourceMappingURL=validators.d.ts.map

package/dist/validators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;AAEnD,eAAO,MAAM,UAAU,EAAE,SAAS,SAAS,EAA+B,CAAC;AAE3E,4DAA4D;AAC5D,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,CAGzE,CAAC;AAEF,iFAAiF;AACjF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,sEAAsE;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC;IAC/D,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,kEAAkE;IAClE,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxC,mCAAmC;IACnC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/B;AAKD,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,YAAY,CAsCnE,CAAC;AAEF,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,WAAW,EAAE,OAAO,GAAG,SAAS,CAU/D"}

package/dist/validators.js

@@ -0,0 +1,56 @@
+export const VALIDATORS = ['valibot', 'zod', 'none'];
+/** Version ranges added to a new project's dependencies. */
+export const VALIDATOR_VERSIONS = {
+    valibot: '^1.5.0',
+    zod: '^4.6.0',
+};
+const fields = (entries) => entries.map(([key, value]) => `  ${key}: ${value},\n`).join('');
+export const SYNTAX = {
+    valibot: {
+        import: "import * as v from 'valibot';",
+        id: `v.object({
+  id: v.pipe(v.string(), v.regex(/^\\d+$/, 'id must be a number'), v.transform(Number)),
+})`,
+        number: 'v.number()',
+        string: 'v.string()',
+        port: `v.optional(
+    v.pipe(v.string(), v.regex(/^\\d+$/, 'PORT must be a number'), v.transform(Number)),
+    '3000',
+  )`,
+        text: (max, required) => `v.pipe(v.string(), v.trim(), v.minLength(1, '${required}'), v.maxLength(${String(max)}))`,
+        object: (entries) => `v.object({\n${fields(entries)}})`,
+        array: (item) => `v.array(${item})`,
+        partialNonEmpty: (schema) => `v.pipe(
+  v.partial(${schema}),
+  v.check((input) => Object.keys(input).length > 0, 'nothing to update'),
+)`,
+        infer: (schema) => `v.InferOutput<typeof ${schema}>`,
+    },
+    zod: {
+        import: "import { z } from 'zod';",
+        id: `z.object({
+  id: z.string().regex(/^\\d+$/, 'id must be a number').transform(Number),
+})`,
+        number: 'z.number()',
+        string: 'z.string()',
+        port: "z.string().regex(/^\\d+$/, 'PORT must be a number').default('3000').transform(Number)",
+        text: (max, required) => `z.string().trim().min(1, '${required}').max(${String(max)})`,
+        object: (entries) => `z.object({\n${fields(entries)}})`,
+        array: (item) => `z.array(${item})`,
+        partialNonEmpty: (schema) => `${schema}
+  .partial()
+  .refine((input) => Object.keys(input).length > 0, 'nothing to update')`,
+        infer: (schema) => `z.infer<typeof ${schema}>`,
+    },
+};
+/** The validator a project already uses, from its package.json; Valibot wins over Zod. */
+export function detectValidator(packageJson) {
+    const pkg = packageJson;
+    const has = (name) => pkg?.dependencies?.[name] !== undefined || pkg?.devDependencies?.[name] !== undefined;
+    if (has('valibot'))
+        return 'valibot';
+    if (has('zod'))
+        return 'zod';
+    return 'none';
+}
+//# sourceMappingURL=validators.js.map

package/dist/validators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,UAAU,GAAyB,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAE3E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,kBAAkB,GAA+C;IAC5E,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;CACd,CAAC;AAqBF,MAAM,MAAM,GAAG,CAAC,OAA+C,EAAE,EAAE,CACjE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,MAAM,GAAqD;IACtE,OAAO,EAAE;QACP,MAAM,EAAE,+BAA+B;QACvC,EAAE,EAAE;;GAEL;QACC,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE;;;IAGN;QACA,IAAI,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CACtB,gDAAgD,QAAQ,mBAAmB,MAAM,CAAC,GAAG,CAAC,IAAI;QAC5F,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,IAAI;QACvD,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,IAAI,GAAG;QACnC,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;cACnB,MAAM;;EAElB;QACE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,wBAAwB,MAAM,GAAG;KACrD;IACD,GAAG,EAAE;QACH,MAAM,EAAE,0BAA0B;QAClC,EAAE,EAAE;;GAEL;QACC,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,uFAAuF;QAC7F,IAAI,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,6BAA6B,QAAQ,UAAU,MAAM,CAAC,GAAG,CAAC,GAAG;QACtF,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,IAAI;QACvD,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,IAAI,GAAG;QACnC,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM;;yEAE+B;QACrE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,MAAM,GAAG;KAC/C;CACF,CAAC;AAEF,0FAA0F;AAC1F,MAAM,UAAU,eAAe,CAAC,WAAoB;IAClD,MAAM,GAAG,GAAG,WAGJ,CAAC;IACT,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAC3B,GAAG,EAAE,YAAY,EAAE,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,GAAG,EAAE,eAAe,EAAE,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IACxF,IAAI,GAAG,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IACrC,IAAI,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7B,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avijs/cli",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "The avi command: project scaffolding, dev mode and build checks.",
   "keywords": [
     "avi",
@@ -10,7 +10,7 @@
   ],
   "license": "MIT",
   "author": "Christopher Robin Chase",
-  "homepage": "https://github.com/chrischase011/avi-js#readme",
+  "homepage": "https://chrischase011.github.io/avi-js/",
   "bugs": {
     "url": "https://github.com/chrischase011/avi-js/issues"
   },
@@ -44,11 +44,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@avijs/compiler": "0.1.1"
+    "@avijs/compiler": "0.2.0"
   },
   "peerDependencies": {
     "typescript": ">=5.8"
   },
+  "devDependencies": {
+    "valibot": "1.5.0",
+    "zod": "4.6.7"
+  },
   "scripts": {
     "typecheck": "tsc -p tsconfig.json"
   }

package/src/cli.ts

@@ -7,15 +7,18 @@ import path from 'node:path';
 import { parseArgs } from 'node:util';
 import { GENERATE_USAGE, generate } from './generate.js';
 import { templateFiles } from './templates.js';
+import { VALIDATORS, type Validator } from './validators.js';
 
 const { version } = createRequire(import.meta.url)('../package.json') as { version: string };
 
 const USAGE = `Usage:
-  avi new <name> [--template modular|minimal] [--dir .] [--avi-version ^x.y.z] [--from <dir>]
+  avi new <name> [--template modular|minimal] [--validator valibot|zod|none] [--dir .]
+          [--avi-version ^x.y.z] [--from <dir>]
       Create a project. The modular template (default) uses modules and decorators;
-      minimal uses plain routes and services. --from points at a folder of packed
-      @avijs tarballs (pnpm pack) to install instead of the registry. --avi-version
-      defaults to this CLI's version.
+      minimal uses plain routes and services. --validator picks the schema library for
+      route validation (default valibot); none keeps handwritten checks. --from points at
+      a folder of packed @avijs tarballs (pnpm pack) to install instead of the registry.
+      --avi-version defaults to this CLI's version.
 ${GENERATE_USAGE}
   avi dev [--project tsconfig.json] [--entry dist/main.js]
       Compile, then recompile and restart on every change.
@@ -49,6 +52,7 @@ async function create(args: readonly string[]): Promise<number> {
     allowPositionals: true,
     options: {
       template: { type: 'string', default: 'modular' },
+      validator: { type: 'string', default: 'valibot' },
       dir: { type: 'string', default: '.' },
       'avi-version': { type: 'string', default: `^${version}` },
       from: { type: 'string' },
@@ -65,6 +69,12 @@ async function create(args: readonly string[]): Promise<number> {
     return 2;
   }
 
+  const validator = values.validator as Validator;
+  if (!VALIDATORS.includes(validator)) {
+    console.error(`Unknown validator "${values.validator}". Use ${VALIDATORS.join(', ')}.`);
+    return 2;
+  }
+
   const target = path.resolve(values.dir, name);
   if (existsSync(target) && (await readdir(target)).length > 0) {
     console.error(`${target} already exists and is not empty`);
@@ -74,6 +84,7 @@ async function create(args: readonly string[]): Promise<number> {
   const files = templateFiles({
     name,
     template,
+    validator,
     aviVersion: values['avi-version'],
     ...(values.from ? { localPackages: await localPackages(values.from, target) } : {}),
   });
@@ -83,7 +94,7 @@ async function create(args: readonly string[]): Promise<number> {
     await writeFile(destination, content);
   }
 
-  console.log(`Created ${name} (${template}) in ${target}
+  console.log(`Created ${name} (${template}, ${validator === 'none' ? 'no validator' : validator}) in ${target}
 
 Next:
   cd ${path.relative(process.cwd(), target) || '.'}