zudojs-cli 2.1.2 → 2.2.0

package/dist/src/wiring/wiring.markers.d.ts

@@ -42,12 +42,14 @@ export interface MarkerInsertResult {
 }
 /**
  * Inserts `line` just before the end marker of `name`, indented like the
- * marker. Idempotent: a line already present between the markers (compared
- * trimmed) is not added again. Exactly one start and one end marker, in
- * that order, are required; anything else is reported as missing markers
- * rather than guessed at.
+ * marker. Idempotent: a line already present anywhere in the file (compared
+ * trimmed) is not added again — a registration the user moved out of the
+ * marker block is still a registration, and re-inserting it between the
+ * markers (`generate resource --force` used to) made the file fail to
+ * compile on the duplicate. Exactly one start and one end marker, in that
+ * order, are required; anything else is reported as missing markers rather
+ * than guessed at.
  */
 export declare function insertBetweenMarkers(source: string, name: MarkerName, line: string): MarkerInsertResult;
 /** The lines currently between the markers of `name`, trimmed. */
 export declare function linesBetweenMarkers(source: string, name: MarkerName): readonly string[];
-//# sourceMappingURL=wiring.markers.d.ts.map

package/dist/src/wiring/wiring.markers.js

@@ -40,10 +40,13 @@ export function renderMarkerBlock(name, lines, indent = "") {
 }
 /**
  * Inserts `line` just before the end marker of `name`, indented like the
- * marker. Idempotent: a line already present between the markers (compared
- * trimmed) is not added again. Exactly one start and one end marker, in
- * that order, are required; anything else is reported as missing markers
- * rather than guessed at.
+ * marker. Idempotent: a line already present anywhere in the file (compared
+ * trimmed) is not added again — a registration the user moved out of the
+ * marker block is still a registration, and re-inserting it between the
+ * markers (`generate resource --force` used to) made the file fail to
+ * compile on the duplicate. Exactly one start and one end marker, in that
+ * order, are required; anything else is reported as missing markers rather
+ * than guessed at.
  */
 export function insertBetweenMarkers(source, name, line) {
     const start = markerStart(name);
@@ -57,9 +60,8 @@ export function insertBetweenMarkers(source, name, line) {
         source.indexOf(end, endAt + 1) !== -1) {
         return { status: "missing-markers", source };
     }
-    const between = source.slice(startAt + start.length, endAt);
     const wanted = line.trim();
-    if (between.split("\n").some((existing) => existing.trim() === wanted)) {
+    if (source.split("\n").some((existing) => existing.trim() === wanted)) {
         return { status: "present", source };
     }
     const lineStart = source.lastIndexOf("\n", endAt) + 1;
@@ -84,4 +86,3 @@ export function linesBetweenMarkers(source, name) {
         .map((line) => line.trim())
         .filter((line) => line.length > 0);
 }
-//# sourceMappingURL=wiring.markers.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudojs-cli",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Command-line interface for scaffolding, generating, and managing Zudojs framework projects.",
   "license": "MIT",
   "author": {
@@ -32,14 +32,14 @@
   ],
   "dependencies": {
     "@clack/prompts": "^1.8.1",
-    "@zudojs/config": "1.3.2",
-    "@zudojs/core": "1.2.3",
-    "@zudojs/errors": "1.3.1",
-    "@zudojs/logger": "1.4.2"
+    "@zudojs/config": "1.3.4",
+    "@zudojs/core": "1.3.0",
+    "@zudojs/errors": "1.4.0",
+    "@zudojs/logger": "1.5.0"
   },
   "devDependencies": {
     "@types/node": "^26.6.2",
-    "@zudojs/constants": "1.1.3",
+    "@zudojs/constants": "1.2.0",
     "tsx": "^4.23.15",
     "typescript": "7.0.2",
     "vitest": "^5.0.1"

package/dist/src/generators/controller/controller.generator.d.ts

@@ -1,11 +0,0 @@
-/**
- * zudojs-cli — Controller Generator
- */
-export interface GenerateControllerOptions {
-    readonly name: string;
-    readonly service?: string;
-    readonly basePath?: string;
-    readonly dryRun?: boolean;
-}
-export declare function generateController(options: GenerateControllerOptions, cwd: string): Promise<string[]>;
-//# sourceMappingURL=controller.generator.d.ts.map

package/dist/src/generators/controller/controller.generator.js

@@ -1,47 +0,0 @@
-/**
- * zudojs-cli — Controller Generator
- */
-import { writeFileTree, mergeBarrelExport, } from "../../utils/utils.fileSystem.js";
-import { CLIGenerationError } from "../../errors/index.js";
-import { normalizeName, toPascalCase } from "../../utils/utils.name.js";
-export async function generateController(options, cwd) {
-    const name = normalizeName(options.name);
-    const nameCamel = toPascalCase(options.name);
-    const basePath = options.basePath ?? "";
-    const prefix = basePath ? `${basePath}/` : "";
-    const indexPath = `${prefix}controllers/index.ts`;
-    const files = {
-        [`${prefix}controllers/${name}.controller.ts`]: `import { createLogger } from "@zudojs/logger";
-
-export class ${nameCamel}Controller {
-  private readonly logger = createLogger({ name: "${name}-controller" });
-
-  async handle(request: Request): Promise<Response> {
-    this.logger.info("${name} request received", { method: request.method, url: request.url });
-
-    try {
-      const body = request.method !== "GET" ? await request.json() : null;
-
-      return Response.json({ ok: true, data: body ?? {} }, { status: 200 });
-    } catch (error) {
-      this.logger.error("Failed to handle ${name} request", { error });
-      return Response.json({ ok: false, error: "Internal server error" }, { status: 500 });
-    }
-  }
-}
-`,
-        // Merge with any existing barrel content instead of overwriting it.
-        [indexPath]: mergeBarrelExport(cwd, indexPath, `export { ${nameCamel}Controller } from "./${name}.controller.js";`),
-    };
-    if (options.dryRun) {
-        return Object.keys(files);
-    }
-    try {
-        await writeFileTree(cwd, files);
-        return Object.keys(files);
-    }
-    catch (error) {
-        throw new CLIGenerationError(`Failed to generate controller: ${name}`, error);
-    }
-}
-//# sourceMappingURL=controller.generator.js.map

package/dist/src/generators/dto/dto.generator.d.ts

@@ -1,12 +0,0 @@
-/**
- * zudojs-cli — DTO Generator
- *
- * Generates DTO files.
- */
-export interface GenerateDtoOptions {
-    readonly name: string;
-    readonly basePath: string;
-    readonly dryRun?: boolean;
-}
-export declare function generateDto(options: GenerateDtoOptions, cwd: string): Promise<string[]>;
-//# sourceMappingURL=dto.generator.d.ts.map

package/dist/src/generators/dto/dto.generator.js

@@ -1,27 +0,0 @@
-/**
- * zudojs-cli — DTO Generator
- *
- * Generates DTO files.
- */
-import { writeFileTree } from "../../utils/utils.fileSystem.js";
-import { normalizeName, toPascalCase } from "../../utils/utils.name.js";
-export async function generateDto(options, cwd) {
-    const name = normalizeName(options.name);
-    const namePascal = toPascalCase(options.name);
-    const files = {
-        [`${options.basePath}/dtos/${name}.dto.ts`]: `/**
- * ${name} DTO.
- */
-
-export interface Create${namePascal}Dto {
-  readonly name: string;
-}
-`,
-    };
-    if (options.dryRun) {
-        return Object.keys(files);
-    }
-    await writeFileTree(cwd, files);
-    return Object.keys(files);
-}
-//# sourceMappingURL=dto.generator.js.map

package/dist/src/generators/dto/index.d.ts

@@ -1,5 +0,0 @@
-/**
- * zudojs-cli — DTO Generator
- */
-export { generateDto, type GenerateDtoOptions } from "./dto.generator.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/src/generators/dto/index.js

@@ -1,5 +0,0 @@
-/**
- * zudojs-cli — DTO Generator
- */
-export { generateDto } from "./dto.generator.js";
-//# sourceMappingURL=index.js.map

package/dist/src/generators/repository/repository.generator.d.ts

@@ -1,10 +0,0 @@
-/**
- * zudojs-cli — Repository Generator
- */
-export interface GenerateRepositoryOptions {
-    readonly name: string;
-    readonly basePath?: string;
-    readonly dryRun?: boolean;
-}
-export declare function generateRepository(options: GenerateRepositoryOptions, cwd: string): Promise<string[]>;
-//# sourceMappingURL=repository.generator.d.ts.map

package/dist/src/generators/repository/repository.generator.js

@@ -1,80 +0,0 @@
-/**
- * zudojs-cli — Repository Generator
- */
-import { writeFileTree, mergeBarrelExport, } from "../../utils/utils.fileSystem.js";
-import { CLIGenerationError } from "../../errors/index.js";
-import { normalizeName, toPascalCase } from "../../utils/utils.name.js";
-export async function generateRepository(options, cwd) {
-    const name = normalizeName(options.name);
-    const nameCamel = toPascalCase(options.name);
-    const basePath = options.basePath ?? "";
-    const prefix = basePath ? `${basePath}/` : "";
-    const indexPath = `${prefix}repositories/index.ts`;
-    const files = {
-        [`${prefix}repositories/${name}.repository.ts`]: `import { createLogger } from "@zudojs/logger";
-
-export interface ${nameCamel}Entity {
-  readonly id: string;
-  readonly createdAt: string;
-  readonly updatedAt: string;
-  [key: string]: unknown;
-}
-
-export class ${nameCamel}Repository {
-  private readonly logger = createLogger({ name: "${name}-repository" });
-  private readonly store = new Map<string, ${nameCamel}Entity>();
-
-  async findById(id: string): Promise<${nameCamel}Entity | null> {
-    this.logger.debug("Finding ${name} by id", { id });
-    return this.store.get(id) ?? null;
-  }
-
-  async findAll(): Promise<readonly ${nameCamel}Entity[]> {
-    this.logger.debug("Finding all ${name} entities");
-    return [...this.store.values()];
-  }
-
-  async create(data: Omit<${nameCamel}Entity, "id" | "createdAt" | "updatedAt">): Promise<${nameCamel}Entity> {
-    const now = new Date().toISOString();
-    const entity: ${nameCamel}Entity = {
-      id: crypto.randomUUID(),
-      createdAt: now,
-      updatedAt: now,
-      ...data,
-    };
-    this.store.set(entity.id, entity);
-    this.logger.info("Created ${name}", { id: entity.id });
-    return entity;
-  }
-
-  async update(id: string, changes: Partial<${nameCamel}Entity>): Promise<${nameCamel}Entity | null> {
-    const existing = this.store.get(id);
-    if (!existing) return null;
-    const updated = { ...existing, ...changes, updatedAt: new Date().toISOString() };
-    this.store.set(id, updated);
-    this.logger.info("Updated ${name}", { id });
-    return updated;
-  }
-
-  async delete(id: string): Promise<boolean> {
-    const deleted = this.store.delete(id);
-    if (deleted) this.logger.info("Deleted ${name}", { id });
-    return deleted;
-  }
-}
-`,
-        // Merge with any existing barrel content instead of overwriting it.
-        [indexPath]: mergeBarrelExport(cwd, indexPath, `export { ${nameCamel}Repository } from "./${name}.repository.js";`),
-    };
-    if (options.dryRun) {
-        return Object.keys(files);
-    }
-    try {
-        await writeFileTree(cwd, files);
-        return Object.keys(files);
-    }
-    catch (error) {
-        throw new CLIGenerationError(`Failed to generate repository: ${name}`, error);
-    }
-}
-//# sourceMappingURL=repository.generator.js.map

package/dist/src/generators/route/index.d.ts

@@ -1,5 +0,0 @@
-/**
- * zudojs-cli — Route Generator
- */
-export { generateRoute, type GenerateRouteOptions } from "./route.generator.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/src/generators/route/index.js

@@ -1,5 +0,0 @@
-/**
- * zudojs-cli — Route Generator
- */
-export { generateRoute } from "./route.generator.js";
-//# sourceMappingURL=index.js.map

package/dist/src/generators/route/route.generator.d.ts

@@ -1,12 +0,0 @@
-/**
- * zudojs-cli — Route Generator
- *
- * Generates route files.
- */
-export interface GenerateRouteOptions {
-    readonly name: string;
-    readonly basePath: string;
-    readonly dryRun?: boolean;
-}
-export declare function generateRoute(options: GenerateRouteOptions, cwd: string): Promise<string[]>;
-//# sourceMappingURL=route.generator.d.ts.map

package/dist/src/generators/route/route.generator.js

@@ -1,31 +0,0 @@
-/**
- * zudojs-cli — Route Generator
- *
- * Generates route files.
- */
-import { writeFileTree } from "../../utils/utils.fileSystem.js";
-import { normalizeName, toCamelCase } from "../../utils/utils.name.js";
-export async function generateRoute(options, cwd) {
-    const name = normalizeName(options.name);
-    const nameCamel = toCamelCase(options.name);
-    const files = {
-        [`${options.basePath}/routes/${name}.route.ts`]: `/**
- * ${name} route.
- */
-
-export const ${nameCamel}Route = {
-  path: "/${name}",
-  method: "GET",
-  handler: async () => {
-    return { message: "${name}" };
-  },
-};
-`,
-    };
-    if (options.dryRun) {
-        return Object.keys(files);
-    }
-    await writeFileTree(cwd, files);
-    return Object.keys(files);
-}
-//# sourceMappingURL=route.generator.js.map

package/dist/src/templates/resource/layers/resourceRoutes.template.d.ts

@@ -1,13 +0,0 @@
-/**
- * zudojs-cli — A resource's CRUD routes (with OpenAPI metadata) and test.
- */
-import { type ResourceNames } from "../resource.names.js";
-/** `routes/<slug>.routes.ts`: `register<Pascal>Routes(router, controller)`. */
-export declare function renderResourceRoutes(n: ResourceNames): string;
-/**
- * `tests/<slug>.test.ts`: drives the routes over real HTTP with
- * `createHttpTestClient`, backed by the in-memory repository.
- * `baseFromTests` is the import prefix from the tests folder to the layers.
- */
-export declare function renderResourceTest(n: ResourceNames, baseFromTests: string): string;
-//# sourceMappingURL=resourceRoutes.template.d.ts.map

package/dist/src/templates/resource/layers/resourceRoutes.template.js

@@ -1,129 +0,0 @@
-/**
- * zudojs-cli — A resource's CRUD routes (with OpenAPI metadata) and test.
- */
-import { withArticle } from "../resource.names.js";
-/** `routes/<slug>.routes.ts`: `register<Pascal>Routes(router, controller)`. */
-export function renderResourceRoutes(n) {
-    const schemas = `Create${n.entity}Schema, ${n.entity}ParamsSchema, ${n.entity}Schema, Update${n.entity}Schema`;
-    return `import type { HttpRouter } from "@zudojs/http";
-import { schema } from "@zudojs/schema";
-
-import type { ${n.pascal}Controller } from "../controllers/${n.slug}.controller.js";
-import { ${schemas} } from "../dtos/${n.slug}.dto.js";
-
-const BASE_PATH = "${n.routePath}";
-const TAGS = ["${n.slug}"];
-const invalid = { description: "The request failed validation" };
-const missing = { description: "No ${n.label} has this id" };
-
-/** Registers the ${n.slug} CRUD routes. */
-export function register${n.pascal}Routes(
-  router: HttpRouter,
-  controller: ${n.pascal}Controller,
-): void {
-  router.get(BASE_PATH, controller.list, {
-    openapi: {
-      summary: "List ${n.slug}",
-      tags: TAGS,
-      responses: { "200": { description: "Every ${n.label}", schema: schema.array(${n.entity}Schema) } },
-    },
-  });
-
-  router.get(\`\${BASE_PATH}/:id\`, controller.get, {
-    openapi: {
-      summary: "Get ${withArticle(n.label)}",
-      tags: TAGS,
-      params: ${n.entity}ParamsSchema,
-      responses: { "200": { description: "The ${n.label}", schema: ${n.entity}Schema }, "400": invalid, "404": missing },
-    },
-  });
-
-  router.post(BASE_PATH, controller.create, {
-    openapi: {
-      summary: "Create ${withArticle(n.label)}",
-      tags: TAGS,
-      body: Create${n.entity}Schema,
-      responses: { "201": { description: "Created", schema: ${n.entity}Schema }, "400": invalid },
-    },
-  });
-
-  router.patch(\`\${BASE_PATH}/:id\`, controller.update, {
-    openapi: {
-      summary: "Update ${withArticle(n.label)}",
-      tags: TAGS,
-      params: ${n.entity}ParamsSchema,
-      body: Update${n.entity}Schema,
-      responses: { "200": { description: "Updated", schema: ${n.entity}Schema }, "400": invalid, "404": missing },
-    },
-  });
-
-  router.delete(\`\${BASE_PATH}/:id\`, controller.remove, {
-    openapi: {
-      summary: "Delete ${withArticle(n.label)}",
-      tags: TAGS,
-      params: ${n.entity}ParamsSchema,
-      responses: { "204": { description: "Deleted" }, "400": invalid, "404": missing },
-    },
-  });
-}
-`;
-}
-/**
- * `tests/<slug>.test.ts`: drives the routes over real HTTP with
- * `createHttpTestClient`, backed by the in-memory repository.
- * `baseFromTests` is the import prefix from the tests folder to the layers.
- */
-export function renderResourceTest(n, baseFromTests) {
-    const b = baseFromTests;
-    return `import { afterAll, describe, it } from "vitest";
-import { createRouter } from "@zudojs/http";
-import { createHttpTestClient } from "@zudojs/testing";
-
-import { ${n.pascal}Controller } from "${b}/controllers/${n.slug}.controller.js";
-import { InMemory${n.pascal}Repository } from "${b}/repositories/${n.slug}.repository.js";
-import { register${n.pascal}Routes } from "${b}/routes/${n.slug}.routes.js";
-import { ${n.pascal}Service } from "${b}/services/${n.slug}.service.js";
-
-const router = createRouter();
-register${n.pascal}Routes(
-  router,
-  new ${n.pascal}Controller(new ${n.pascal}Service(new InMemory${n.pascal}Repository())),
-);
-const client = createHttpTestClient(router);
-afterAll(() => client.close());
-
-describe("${n.routePath}", () => {
-  it("creates, reads, updates and deletes ${withArticle(n.label)}", async () => {
-    const created = await client
-      .post("${n.routePath}")
-      .send({ name: "Ada" })
-      .expect(201)
-      .expectJson({ name: "Ada" });
-    const { id } = created.json<{ id: string }>();
-
-    await client.get(\`${n.routePath}/\${id}\`).expect(200).expectJson({ id, name: "Ada" });
-    await client.get("${n.routePath}").expect(200);
-    await client
-      .patch(\`${n.routePath}/\${id}\`)
-      .send({ name: "Grace" })
-      .expect(200)
-      .expectJson({ name: "Grace" });
-    await client.delete(\`${n.routePath}/\${id}\`).expect(204);
-    await client.get(\`${n.routePath}/\${id}\`).expect(404);
-  });
-
-  it("rejects an invalid body with 400", async () => {
-    await client
-      .post("${n.routePath}")
-      .send({ name: "" })
-      .expect(400)
-      .expectJson({ error: "Validation failed" });
-  });
-
-  it("rejects an id that is not a UUID with 400", async () => {
-    await client.get("${n.routePath}/not-a-uuid").expect(400);
-  });
-});
-`;
-}
-//# sourceMappingURL=resourceRoutes.template.js.map