zudojs-cli 2.1.1 → 2.1.3

package/dist/src/templates/shared/{dockerfile.template.js → dockerfile/dockerfile.template.js}

@@ -8,30 +8,7 @@
  * unprivileged `node` user and declares a /health HEALTHCHECK. The images
  * used to run as root and ship the whole dev toolchain.
  */
-/** The dependency install command for a package manager inside a Dockerfile. */
-export function dockerInstallCommand(packageManager) {
-    // No lockfile is generated, so never `npm ci`; bare node images need
-    // corepack for pnpm/yarn; bun is not available there, so npm is used.
-    switch (packageManager) {
-        case "pnpm":
-            return "corepack enable && pnpm install";
-        case "yarn":
-            return "corepack enable && yarn install";
-        default:
-            return "npm install";
-    }
-}
-/** Removes dev dependencies after the build (scripts off: prisma is a dev tool). */
-function dockerPruneCommand(packageManager) {
-    switch (packageManager) {
-        case "pnpm":
-            return "pnpm prune --prod --ignore-scripts";
-        case "yarn":
-            return undefined;
-        default:
-            return "npm prune --omit=dev --ignore-scripts";
-    }
-}
+import { lockedInstallSteps, workspaceMemberInstallSteps, } from "./dockerfile.install.js";
 function runnerFor(packageManager) {
     return packageManager === "npm" || packageManager === "bun" ? "npm" : packageManager;
 }
@@ -54,24 +31,31 @@ CMD ["node", "${dist}/server.js"]
  * project root; `appPath` is the app's directory (`.` for a single-app
  * project). pnpm's `pnpm-workspace.yaml` is copied for its build-script
  * allow-list, without which pnpm 11 refuses to install.
+ *
+ * An app at the project root copies its lockfile and installs frozen (see
+ * `dockerfile.install.ts`); an app inside a workspace cannot use the
+ * workspace lockfile on its own, and its Dockerfile says so.
  */
 export function renderAppPackageDockerfile(options) {
     const app = options.appPath.replace(/^\.\/?/, "").replace(/\/$/, "");
     const at = (file) => (app === "" ? file : `${app}/${file}`);
     const pm = options.packageManager;
-    const prune = dockerPruneCommand(pm);
+    const steps = app === "" ? lockedInstallSteps(pm) : workspaceMemberInstallSteps(pm);
+    const manifests = app === ""
+        ? [`COPY ${["package.json", ...steps.files].join(" ")} ./`]
+        : [`COPY ${at("package.json")} ./`, ...steps.files.map((file) => `COPY ${file} ./`)];
     const lines = [
         "# syntax=docker/dockerfile:1",
         "FROM node:24-alpine AS build",
         "WORKDIR /app",
-        `COPY ${at("package.json")} ./`,
-        ...(pm === "pnpm" ? ["COPY pnpm-workspace.yaml ./"] : []),
+        ...steps.comment,
+        ...manifests,
         ...(options.prisma ? [`COPY ${at("prisma.config.ts")} ./`, `COPY ${at("prisma")} ./prisma`] : []),
-        `RUN ${dockerInstallCommand(pm)}`,
+        `RUN ${steps.install}`,
         `COPY ${at("tsconfig.json")} ./`,
         `COPY ${at("src")} ./src`,
         `RUN ${runnerFor(pm)} run build`,
-        ...(prune === undefined ? [] : [`RUN ${prune}`]),
+        ...(steps.prune === undefined ? [] : [`RUN ${steps.prune}`]),
         "",
     ];
     return `${lines.join("\n")}\n${runtimeStage(options.port, "dist", "/app")}`;
@@ -86,13 +70,16 @@ export function renderWorkspaceAppDockerfile(options) {
     const runner = runnerFor(options.packageManager);
     const build = dir === "" ? `${runner} run build` : `cd ${dir} && ${runner} run build`;
     const dist = dir === "" ? "dist" : `${dir}/dist`;
+    // The whole workspace is copied, lockfile included, so it installs frozen.
+    const steps = lockedInstallSteps(options.packageManager);
     // pnpm links workspace dependencies through the root node_modules, so
     // the runtime stage takes the whole built workspace.
     return `# syntax=docker/dockerfile:1
 FROM node:24-alpine AS build
 WORKDIR /app
+${steps.comment.join("\n")}
 COPY . .
-RUN ${dockerInstallCommand(options.packageManager)}
+RUN ${steps.install}
 RUN ${build}
 
 FROM node:24-alpine AS runtime

package/dist/src/templates/shared/dockerfile/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * zudojs-cli — Generated Dockerfiles and how they install dependencies.
+ */
+export * from "./dockerfile.template.js";
+export * from "./dockerfile.install.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/src/templates/shared/dockerfile/index.js

@@ -0,0 +1,6 @@
+/**
+ * zudojs-cli — Generated Dockerfiles and how they install dependencies.
+ */
+export * from "./dockerfile.template.js";
+export * from "./dockerfile.install.js";
+//# sourceMappingURL=index.js.map

package/dist/src/templates/shared/index.d.ts

@@ -3,7 +3,7 @@
  */
 export * from "./appRuntime.template.js";
 export * from "./capability.template.js";
-export * from "./dockerfile.template.js";
+export * from "./dockerfile/index.js";
 export * from "./pnpm.template.js";
 export * from "./server.template.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/templates/shared/index.js

@@ -3,7 +3,7 @@
  */
 export * from "./appRuntime.template.js";
 export * from "./capability.template.js";
-export * from "./dockerfile.template.js";
+export * from "./dockerfile/index.js";
 export * from "./pnpm.template.js";
 export * from "./server.template.js";
 //# sourceMappingURL=index.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.1",
+  "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.1",
-    "@zudojs/core": "1.2.2",
-    "@zudojs/errors": "1.3.0",
-    "@zudojs/logger": "1.4.1"
+    "@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.2",
+    "@zudojs/constants": "1.1.4",
     "tsx": "^4.23.15",
     "typescript": "7.0.2",
     "vitest": "^5.0.1"

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

@@ -1,12 +0,0 @@
-/**
- * zudojs-cli — Service Generator
- *
- * Generates a new service with CQRS structure.
- */
-export interface GenerateServiceOptions {
-    readonly name: string;
-    readonly basePath?: string;
-    readonly dryRun?: boolean;
-}
-export declare function generateService(options: GenerateServiceOptions, cwd: string): Promise<string[]>;
-//# sourceMappingURL=service.generator.d.ts.map

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

@@ -1,41 +0,0 @@
-/**
- * zudojs-cli — Service Generator
- *
- * Generates a new service with CQRS structure.
- */
-import { writeFileTree, mergeBarrelExport, } from "../../utils/utils.fileSystem.js";
-import { CLIGenerationError } from "../../errors/index.js";
-import { assertGeneratableName, toPascalCase } from "../../utils/utils.name.js";
-export async function generateService(options, cwd) {
-    const basePath = options.basePath ?? "services";
-    const name = assertGeneratableName(options.name, "service name");
-    const namePascal = toPascalCase(name);
-    const files = {
-        [`${basePath}/${name}/${name}.service.ts`]: `import { createLogger } from "@zudojs/logger";
-
-export class ${namePascal}Service {
-  private readonly logger = createLogger({ name: "${name}-service" });
-
-  async initialize(): Promise<void> {
-    this.logger.info("${name} service initialized");
-  }
-}
-`,
-        // Merge with any existing barrel content instead of overwriting it.
-        [`${basePath}/${name}/index.ts`]: mergeBarrelExport(cwd, `${basePath}/${name}/index.ts`, `export { ${namePascal}Service } from "./${name}.service.js";`),
-        // Preserve any existing content in the CQRS barrels.
-        [`${basePath}/${name}/commands/index.ts`]: mergeBarrelExport(cwd, `${basePath}/${name}/commands/index.ts`, ""),
-        [`${basePath}/${name}/queries/index.ts`]: mergeBarrelExport(cwd, `${basePath}/${name}/queries/index.ts`, ""),
-    };
-    if (options.dryRun) {
-        return Object.keys(files);
-    }
-    try {
-        await writeFileTree(cwd, files);
-        return Object.keys(files);
-    }
-    catch (error) {
-        throw new CLIGenerationError(`Failed to generate service: ${name}`, error);
-    }
-}
-//# sourceMappingURL=service.generator.js.map