zudojs-cli 2.1.2 → 2.1.3

package/dist/src/commands/generate.command.js

@@ -9,7 +9,7 @@ import { join } from "node:path";
 import { generateModule } from "../generators/module/module.generator.js";
 import { generateCommand } from "../generators/command/command.generator.js";
 import { generateQuery } from "../generators/query/query.generator.js";
-import { generateMiddleware } from "../generators/middleware/middleware.generator.js";
+import { generateMiddleware, } from "../generators/middleware/middleware.generator.js";
 import { generateEvent } from "../generators/event/event.generator.js";
 import { generateJob } from "../generators/job/job.generator.js";
 import { generateModel } from "../generators/model/model.generator.js";
@@ -209,6 +209,15 @@ export async function runGenerateCommand(context) {
                 .map((step) => `  ${step}`)
                 .join("\n")}`);
         },
+        onMiddlewareRegistered: (registration) => {
+            if (registration.registered) {
+                context.logger.info(`Registered in the middleware pipeline of ${registration.serverFile}.`);
+                return;
+            }
+            context.logger.warn(`Could not register the middleware automatically (the zudojs:server-imports or zudojs:server-middleware markers are missing). Add:\n${registration.manualSteps
+                .map((step) => `  ${step}`)
+                .join("\n")}`);
+        },
     }, cwd);
     if (dryRun) {
         context.logger.info(`Dry run: ${fileCount(result.length)} would be generated (nothing written):`);
@@ -249,7 +258,7 @@ async function runSchematic(schematic, name, options, cwd) {
             case "query":
                 return await generateQuery({ name, ...(cqrsService ? { service: cqrsService } : {}), basePath, dryRun }, cwd);
             case "middleware":
-                return await generateMiddleware({ name, basePath, dryRun }, cwd);
+                return await generateMiddleware({ name, basePath, dryRun, onRegistered: options.onMiddlewareRegistered }, cwd);
             case "event":
                 return await generateEvent({ name, basePath, dryRun }, cwd);
             case "job":

package/dist/src/constants/zudojsVersions.generated.js

@@ -6,43 +6,43 @@
  * Do not edit by hand; run `node scripts/generateZudojsVersions.mjs`.
  */
 export const ZUDOJS_PACKAGE_VERSIONS = Object.freeze({
-    "@zudojs/adapters": "1.2.2",
-    "@zudojs/api": "1.2.2",
-    "@zudojs/auth": "1.3.2",
-    "@zudojs/auth-oauth": "1.2.4",
-    "@zudojs/cache": "1.2.2",
-    "@zudojs/config": "1.3.2",
-    "@zudojs/constants": "1.1.3",
-    "@zudojs/container": "1.2.2",
-    "@zudojs/core": "1.2.3",
-    "@zudojs/cqrs": "1.2.2",
-    "@zudojs/crypto": "1.3.2",
-    "@zudojs/database": "1.3.2",
-    "@zudojs/docs": "1.0.5",
-    "@zudojs/errors": "1.3.1",
-    "@zudojs/events": "1.3.2",
-    "@zudojs/feature-flags": "1.4.1",
-    "@zudojs/http": "1.4.3",
-    "@zudojs/lifecycle": "1.2.2",
-    "@zudojs/logger": "1.4.2",
-    "@zudojs/messaging": "1.2.2",
-    "@zudojs/middleware": "1.1.1",
-    "@zudojs/observability": "1.2.2",
-    "@zudojs/openapi": "1.5.1",
-    "@zudojs/permissions": "1.4.2",
-    "@zudojs/plugins": "1.3.2",
-    "@zudojs/queue": "1.5.0",
-    "@zudojs/rpc": "1.4.2",
-    "@zudojs/runtime": "1.3.2",
-    "@zudojs/scheduler": "1.2.1",
-    "@zudojs/schema": "1.2.2",
-    "@zudojs/security": "1.3.2",
-    "@zudojs/serialization": "1.2.2",
-    "@zudojs/storage": "1.2.2",
-    "@zudojs/tenancy": "1.3.2",
-    "@zudojs/testing": "1.2.3",
-    "@zudojs/transactions": "1.2.1",
+    "@zudojs/adapters": "1.2.3",
+    "@zudojs/api": "1.2.3",
+    "@zudojs/auth": "1.3.3",
+    "@zudojs/auth-oauth": "1.2.5",
+    "@zudojs/cache": "1.2.3",
+    "@zudojs/config": "1.3.3",
+    "@zudojs/constants": "1.1.4",
+    "@zudojs/container": "1.2.3",
+    "@zudojs/core": "1.2.4",
+    "@zudojs/cqrs": "1.2.3",
+    "@zudojs/crypto": "1.3.3",
+    "@zudojs/database": "1.4.0",
+    "@zudojs/docs": "1.0.6",
+    "@zudojs/errors": "1.3.2",
+    "@zudojs/events": "1.3.3",
+    "@zudojs/feature-flags": "1.4.2",
+    "@zudojs/http": "1.4.4",
+    "@zudojs/lifecycle": "1.2.3",
+    "@zudojs/logger": "1.4.3",
+    "@zudojs/messaging": "1.2.3",
+    "@zudojs/middleware": "1.1.2",
+    "@zudojs/observability": "1.2.3",
+    "@zudojs/openapi": "1.5.2",
+    "@zudojs/permissions": "1.4.3",
+    "@zudojs/plugins": "1.3.3",
+    "@zudojs/queue": "1.5.1",
+    "@zudojs/rpc": "1.4.3",
+    "@zudojs/runtime": "1.3.3",
+    "@zudojs/scheduler": "1.2.2",
+    "@zudojs/schema": "1.2.3",
+    "@zudojs/security": "1.3.3",
+    "@zudojs/serialization": "1.2.3",
+    "@zudojs/storage": "1.2.3",
+    "@zudojs/tenancy": "1.3.3",
+    "@zudojs/testing": "1.2.4",
+    "@zudojs/transactions": "1.2.2",
     "@zudojs/types": "1.2.0",
-    "@zudojs/validation": "1.1.1",
+    "@zudojs/validation": "1.1.2",
 });
 //# sourceMappingURL=zudojsVersions.generated.js.map

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

@@ -1,5 +1,6 @@
 /**
  * zudojs-cli — Middleware Generator
  */
-export { generateMiddleware, type GenerateMiddlewareOptions, } from "./middleware.generator.js";
+export { generateMiddleware, middlewareAppSrc, middlewareServerLines, type GenerateMiddlewareOptions, type MiddlewareRegistration, } from "./middleware.generator.js";
+export { renderMiddlewareFile, type MiddlewareFileOptions } from "./middleware.template.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,5 +1,6 @@
 /**
  * zudojs-cli — Middleware Generator
  */
-export { generateMiddleware, } from "./middleware.generator.js";
+export { generateMiddleware, middlewareAppSrc, middlewareServerLines, } from "./middleware.generator.js";
+export { renderMiddlewareFile } from "./middleware.template.js";
 //# sourceMappingURL=index.js.map

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

@@ -1,12 +1,39 @@
 /**
  * zudojs-cli — Middleware Generator
  *
- * Generates middleware files.
+ * Writes `<basePath>/middlewares/<name>.middleware.ts` (an `HttpMiddleware`
+ * from @zudojs/http), exports it from the folder barrel and registers it in
+ * the app's `src/server.ts` between the `zudojs:server-imports` and
+ * `zudojs:server-middleware` markers. A server.ts missing either marker pair
+ * is left unchanged (no import without its registration) and the lines to
+ * add by hand are reported instead.
  */
 export interface GenerateMiddlewareOptions {
     readonly name: string;
     readonly basePath: string;
     readonly dryRun?: boolean;
+    /** Receives the registration outcome (e.g. lines to add by hand). */
+    readonly onRegistered?: (registration: MiddlewareRegistration) => void;
 }
+/** Outcome of registering a generated middleware in `server.ts`. */
+export interface MiddlewareRegistration {
+    /** Whether server.ts now runs the middleware. */
+    readonly registered: boolean;
+    /** The server file it was (or should be) registered in. */
+    readonly serverFile: string;
+    /** Lines to add by hand when `registered` is false. */
+    readonly manualSteps: readonly string[];
+}
+/**
+ * The app source directory owning `basePath`: `src` for `src` and
+ * `src/modules/billing`, `apps/services/x/src` for a service.
+ */
+export declare function middlewareAppSrc(basePath: string): string;
+/** The import and pipeline lines that register `factoryName` in server.ts. */
+export declare function middlewareServerLines(basePath: string, factoryName: string): {
+    readonly serverFile: string;
+    readonly importLine: string;
+    readonly entryLine: string;
+};
 export declare function generateMiddleware(options: GenerateMiddlewareOptions, cwd: string): Promise<string[]>;
 //# sourceMappingURL=middleware.generator.d.ts.map

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

@@ -1,29 +1,74 @@
 /**
  * zudojs-cli — Middleware Generator
  *
- * Generates middleware files.
+ * Writes `<basePath>/middlewares/<name>.middleware.ts` (an `HttpMiddleware`
+ * from @zudojs/http), exports it from the folder barrel and registers it in
+ * the app's `src/server.ts` between the `zudojs:server-imports` and
+ * `zudojs:server-middleware` markers. A server.ts missing either marker pair
+ * is left unchanged (no import without its registration) and the lines to
+ * add by hand are reported instead.
  */
-import { writeFileTree } from "../../utils/utils.fileSystem.js";
+import { posix } from "node:path";
+import { CLIValidationError } from "../../errors/index.js";
+import { mergeBarrelExport, writeFileTree } from "../../utils/utils.fileSystem.js";
 import { normalizeName, toCamelCase } from "../../utils/utils.name.js";
+import { MARKERS, applyMarkerEdits, conflictingImport, planMarkerEdits, } from "../../wiring/index.js";
+import { renderMiddlewareFile } from "./middleware.template.js";
+/**
+ * The app source directory owning `basePath`: `src` for `src` and
+ * `src/modules/billing`, `apps/services/x/src` for a service.
+ */
+export function middlewareAppSrc(basePath) {
+    return basePath.replace(/\/modules\/[^/]+$/, "");
+}
+/** The import and pipeline lines that register `factoryName` in server.ts. */
+export function middlewareServerLines(basePath, factoryName) {
+    const appSrc = middlewareAppSrc(basePath);
+    const barrel = posix.relative(appSrc, `${basePath}/middlewares/index.js`);
+    return {
+        serverFile: `${appSrc}/server.ts`,
+        importLine: `import { ${factoryName} } from "./${barrel}";`,
+        entryLine: `${factoryName}(),`,
+    };
+}
 export async function generateMiddleware(options, cwd) {
     const name = normalizeName(options.name);
-    const nameCamel = toCamelCase(options.name);
+    const factoryName = `${toCamelCase(options.name)}Middleware`;
+    const lines = middlewareServerLines(options.basePath, factoryName);
+    const barrel = `${options.basePath}/middlewares/index.ts`;
+    const clash = conflictingImport(cwd, lines.serverFile, lines.importLine);
+    if (clash !== undefined) {
+        throw new CLIValidationError(`${lines.serverFile} already imports ${factoryName} (${clash.trim()}), so middleware "${name}" cannot be registered. Choose another name.`);
+    }
     const files = {
-        [`${options.basePath}/middlewares/${name}.middleware.ts`]: `/**
- * ${name} middleware.
- */
-
-export function ${nameCamel}Middleware() {
-  return async (ctx: unknown, next: () => Promise<void>) => {
-    await next();
-  };
-}
-`,
+        [`${options.basePath}/middlewares/${name}.middleware.ts`]: renderMiddlewareFile({
+            name,
+            factoryName,
+            serverFile: lines.serverFile,
+        }),
+        [barrel]: mergeBarrelExport(cwd, barrel, `export { ${factoryName} } from "./${name}.middleware.js";`),
     };
+    const edits = [
+        { file: lines.serverFile, marker: MARKERS.serverImports, line: lines.importLine },
+        { file: lines.serverFile, marker: MARKERS.serverMiddleware, line: lines.entryLine },
+    ];
+    const planned = planMarkerEdits(cwd, edits).outcome;
+    const registered = planned.manualSteps.length === 0;
     if (options.dryRun) {
-        return Object.keys(files);
+        return [...Object.keys(files), ...(registered ? planned.edited : [])];
     }
     await writeFileTree(cwd, files);
-    return Object.keys(files);
+    const edited = registered ? (await applyMarkerEdits(cwd, edits)).edited : [];
+    options.onRegistered?.({
+        registered,
+        serverFile: lines.serverFile,
+        manualSteps: registered
+            ? []
+            : [
+                `In ${lines.serverFile}: ${lines.importLine}`,
+                `In ${lines.serverFile}: add ${lines.entryLine} to the middlewares list of the HttpMiddlewarePipeline, before dispatch`,
+            ],
+    });
+    return [...Object.keys(files), ...edited];
 }
 //# sourceMappingURL=middleware.generator.js.map

package/dist/src/generators/middleware/middleware.template.d.ts

@@ -0,0 +1,21 @@
+/**
+ * zudojs-cli — Generated `<name>.middleware.ts`.
+ *
+ * `generate middleware` used to write
+ * `(ctx: unknown, next: () => Promise<void>) => Promise<void>`: registering
+ * it in the server pipeline failed tsc with TS2322, and because it returned
+ * nothing the response produced by `next()` was dropped. The file is now a
+ * real `HttpMiddleware` from @zudojs/http that returns `next()`'s response.
+ */
+/** Options for {@link renderMiddlewareFile}. */
+export interface MiddlewareFileOptions {
+    /** Normalized (kebab-case) name, e.g. `request-timer`. */
+    readonly name: string;
+    /** Factory function name, e.g. `requestTimerMiddleware`. */
+    readonly factoryName: string;
+    /** Where the factory is registered, e.g. `src/server.ts`. */
+    readonly serverFile: string;
+}
+/** Renders the middleware source file. */
+export declare function renderMiddlewareFile(options: MiddlewareFileOptions): string;
+//# sourceMappingURL=middleware.template.d.ts.map

package/dist/src/generators/middleware/middleware.template.js

@@ -0,0 +1,35 @@
+/**
+ * zudojs-cli — Generated `<name>.middleware.ts`.
+ *
+ * `generate middleware` used to write
+ * `(ctx: unknown, next: () => Promise<void>) => Promise<void>`: registering
+ * it in the server pipeline failed tsc with TS2322, and because it returned
+ * nothing the response produced by `next()` was dropped. The file is now a
+ * real `HttpMiddleware` from @zudojs/http that returns `next()`'s response.
+ */
+/** Renders the middleware source file. */
+export function renderMiddlewareFile(options) {
+    return `import type { HttpMiddleware } from "@zudojs/http";
+
+/**
+ * ${options.name} middleware.
+ *
+ * It runs when \`${options.factoryName}()\` is in the \`middlewares\` list of
+ * ${options.serverFile}, between the \`// zudojs:server-middleware\` markers:
+ * after the security headers, CORS and rate limit, before routing.
+ * \`zudojs generate middleware\` adds it there when the markers exist.
+ *
+ * To answer without calling \`next()\`, return a response such as
+ * \`createResponseContext({ status: 403 }).json({ error: "Forbidden" })\`.
+ * Otherwise return what \`next()\` resolves to, and \`clone()\` it before
+ * changing its headers.
+ */
+export function ${options.factoryName}(): HttpMiddleware {
+  return async (_context, next) => {
+    const response = await next();
+    return response;
+  };
+}
+`;
+}
+//# sourceMappingURL=middleware.template.js.map

package/dist/src/templates/shared/server.template.d.ts

@@ -14,6 +14,13 @@
  * 500. On SIGINT/SIGTERM integrations drain, HTTP stops, then the runtime
  * stops. `tests/generatedProject.typecheck.test.ts` type-checks the output
  * against the current `@zudojs/*` sources.
+ *
+ * The signal listeners stay registered (`process.on`, not `once`) for the
+ * whole shutdown. Under `tsx watch`, Ctrl+C delivers SIGINT twice (from the
+ * terminal and forwarded by the watcher); with `once` the second signal
+ * found no listener and Node's default action killed the process before
+ * the runtime had stopped or logged anything. "Listening on" is logged once
+ * the listeners are in place, so a signal sent after it is always handled.
  */
 /** Options for {@link renderServerFile}. */
 export interface ServerFileOptions {

package/dist/src/templates/shared/server.template.js

@@ -14,6 +14,13 @@
  * 500. On SIGINT/SIGTERM integrations drain, HTTP stops, then the runtime
  * stops. `tests/generatedProject.typecheck.test.ts` type-checks the output
  * against the current `@zudojs/*` sources.
+ *
+ * The signal listeners stay registered (`process.on`, not `once`) for the
+ * whole shutdown. Under `tsx watch`, Ctrl+C delivers SIGINT twice (from the
+ * terminal and forwarded by the watcher); with `once` the second signal
+ * found no listener and Node's default action killed the process before
+ * the runtime had stopped or logged anything. "Listening on" is logged once
+ * the listeners are in place, so a signal sent after it is always handled.
  */
 import { MARKERS, renderMarkerBlock } from "../../wiring/index.js";
 /** Emits a string as a TypeScript string literal that cannot break out. */
@@ -98,13 +105,16 @@ const server = createHttpServer({
 });
 
 await server.start();
-console.log(\`Listening on http://\${config.host}:\${server.address?.port ?? config.port}\`);
 
 let stopping = false;
 for (const signal of ["SIGINT", "SIGTERM"] as const) {
-  process.once(signal, () => {
-    if (stopping) return;
+  process.on(signal, () => {
+    if (stopping) {
+      console.log(\`Received \${signal} again: already shutting down.\`);
+      return;
+    }
     stopping = true;
+    console.log(\`Received \${signal}: shutting down.\`);
     void drainIntegrations(integrations)
       .then(() => server.stop())
       .then(() => runtime.stop())
@@ -117,6 +127,8 @@ for (const signal of ["SIGINT", "SIGTERM"] as const) {
       });
   });
 }
+
+console.log(\`Listening on http://\${config.host}:\${server.address?.port ?? config.port}\`);
 `;
 }
 //# sourceMappingURL=server.template.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudojs-cli",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "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.3",
+    "@zudojs/core": "1.2.4",
+    "@zudojs/errors": "1.3.2",
+    "@zudojs/logger": "1.4.3"
   },
   "devDependencies": {
     "@types/node": "^26.6.2",
-    "@zudojs/constants": "1.1.3",
+    "@zudojs/constants": "1.1.4",
     "tsx": "^4.23.15",
     "typescript": "7.0.2",
     "vitest": "^5.0.1"