zudojs-cli 0.1.2 → 1.1.0

package/dist/src/templates/microservice/microservice.template.js

@@ -21,68 +21,104 @@
  * └── README.md
  * ```
  */
+import { ZUDOJS_PACKAGES_VERSION } from "../../constants/index.js";
+import { normalizeName } from "../../utils/utils.name.js";
+import { RUNTIME_APP_DEPENDENCIES, moduleSpec, renderAppFile, renderModuleFile, renderServerFile, renderPnpmWorkspaceFile, } from "../shared/index.js";
+/** Default service names used when none are provided. */
+export const DEFAULT_MICROSERVICE_SERVICES = [
+    "identity",
+    "enrollment",
+    "assessment",
+    "notification",
+];
+/**
+ * The gateway app is always generated at `apps/gateway`, so "gateway" is a
+ * reserved name: a service called `gateway` would produce a second, competing
+ * gateway at `apps/services/gateway`.
+ */
+export const RESERVED_MICROSERVICE_APP_NAMES = ["gateway"];
+/**
+ * Normalizes a requested service list into the service apps generated under
+ * `apps/services/`. Reserved names and duplicates are dropped; an empty list
+ * falls back to DEFAULT_MICROSERVICE_SERVICES.
+ */
+export function resolveMicroserviceServices(requested) {
+    const normalized = requested
+        .map((service) => normalizeName(service))
+        .filter((service) => service.length > 0 &&
+        !RESERVED_MICROSERVICE_APP_NAMES.some((reserved) => reserved === service));
+    const unique = [...new Set(normalized)];
+    return unique.length > 0 ? unique : [...DEFAULT_MICROSERVICE_SERVICES];
+}
 export function generateMicroserviceFiles(options) {
     const nameSlug = options.projectName
         .replace(/[^a-z0-9-]+/gi, "-")
         .toLowerCase();
-    const services = options.services.length > 0
-        ? options.services
-        : ["identity", "enrollment", "assessment", "notification"];
+    const services = resolveMicroserviceServices(options.services);
     const files = {};
     // Root package.json (workspace root)
     const rootScripts = {
         dev: options.packageManager === "npm"
-            ? "npm run dev --workspaces"
+            ? "npm run dev --workspaces --if-present"
             : options.packageManager === "yarn"
-                ? "yarn dev"
+                ? "yarn workspaces run dev"
                 : options.packageManager === "bun"
-                    ? "bun run dev"
+                    ? "bun run --filter '*' dev"
                     : "pnpm -r run dev",
         build: options.packageManager === "npm"
-            ? "npm run build --workspaces"
+            ? "npm run build --workspaces --if-present"
             : options.packageManager === "yarn"
-                ? "yarn build"
+                ? "yarn workspaces run build"
                 : options.packageManager === "bun"
-                    ? "bun run build"
+                    ? "bun run --filter '*' build"
                     : "pnpm -r run build",
         typecheck: options.packageManager === "npm"
-            ? "npm run typecheck --workspaces"
+            ? "npm run typecheck --workspaces --if-present"
             : options.packageManager === "yarn"
-                ? "yarn typecheck"
+                ? "yarn workspaces run typecheck"
                 : options.packageManager === "bun"
-                    ? "bun run typecheck"
+                    ? "bun run --filter '*' typecheck"
                     : "pnpm -r run typecheck",
     };
+    const workspaceGlobs = ["apps/gateway", "apps/services/*"];
     files["package.json"] =
         JSON.stringify({
             name: nameSlug,
             version: "0.1.0",
             private: true,
+            type: "module",
             description: `Microservice architecture built with Zudojs framework`,
+            zudojs: {
+                projectType: "backend",
+                architecture: "microservice",
+                features: [],
+            },
+            ...(options.packageManager === "pnpm"
+                ? {}
+                : { workspaces: workspaceGlobs }),
             scripts: rootScripts,
             devDependencies: {
                 tsx: "^4.7.0",
                 typescript: "^5.7.0",
             },
         }, null, 2) + "\n";
-    files["pnpm-workspace.yaml"] = `packages:
-   - gateway
-   - services/*
- `;
-    // Docker Compose
+    if (options.packageManager === "pnpm") {
+        files["pnpm-workspace.yaml"] = renderPnpmWorkspaceFile(workspaceGlobs);
+    }
+    // Docker Compose — gateway on 3000, service i on 3001+i.
     let composeServices = "";
     for (let i = 0; i < services.length; i++) {
         const svc = services[i];
-        const port = 3000 + i;
+        const port = 3001 + i;
         composeServices += `  ${svc}:
     build:
       context: .
       dockerfile: apps/services/${svc}/Dockerfile
     ports:
-      - "${port}:3000"
+      - "${port}:${port}"
     environment:
       - NODE_ENV=development
-      - PORT=3000
+      - PORT=${port}
     depends_on: []
 `;
     }
@@ -106,7 +142,8 @@ PORT=3000
     files[".gitignore"] = `node_modules/
 dist/
 .env
-*.log.data/
+*.log
+.data/
 `;
     files["README.md"] = `# ${options.projectName}
 
@@ -114,13 +151,14 @@ A microservice architecture built with the Zudojs framework.
 
 ## Services
 
-${services.map((s, i) => `- **${s}** - Port ${3000 + i}`).join("\n")}
+- **gateway** - Port 3000
+${services.map((s, i) => `- **${s}** - Port ${3001 + i}`).join("\n")}
 
 ## Getting Started
 
 \`\`\`bash
-${options.packageManager === "npm" ? "<SECRET_3ff5e0e0> install" : options.packageManager === "yarn" ? "yarn install" : options.packageManager === "bun" ? "bun install" : "pnpm install"}
-${options.packageManager === "npm" ? "<SECRET_3ff5e0e0> run dev" : options.packageManager === "yarn" ? "yarn dev" : options.packageManager === "bun" ? "bun run dev" : "pnpm dev"}
+${options.packageManager === "npm" ? "npm install" : options.packageManager === "yarn" ? "yarn install" : options.packageManager === "bun" ? "bun install" : "pnpm install"}
+${options.packageManager === "npm" ? "npm run dev" : options.packageManager === "yarn" ? "yarn dev" : options.packageManager === "bun" ? "bun run dev" : "pnpm dev"}
 \`\`\`
 
 ## Docker
@@ -135,35 +173,21 @@ MIT
 `;
     // Shared types
     files["src/types/index.ts"] = ``;
-    // Gateway service
-    const gatewayDeps = ["@zudojs/http", "@zudojs/config", "@zudojs/logger"];
-    files["apps/gateway/package.json"] =
-        JSON.stringify({
-            name: "@zudojs/gateway",
-            version: "0.1.0",
-            private: true,
-            type: "module",
-            scripts: {
-                dev: "node --import tsx watch src/server.ts",
-                start: "node dist/server.js",
-                build: "tsc",
-                typecheck: "tsc --noEmit",
-            },
-            dependencies: Object.fromEntries(gatewayDeps.map((d) => [d, "workspace:*"])),
-            devDependencies: {
-                tsx: "^4.7.0",
-                typescript: "^5.7.0",
-                "@types/node": "^22.0.0",
-            },
-        }, null, 2) + "\n";
-    files["apps/gateway/tsconfig.json"] = `{
+    // Install command used inside Dockerfiles (no lockfile is generated, so
+    // never use `npm ci`; enable corepack for pnpm/yarn on bare node images).
+    const dockerInstall = options.packageManager === "pnpm"
+        ? "corepack enable && pnpm install"
+        : options.packageManager === "yarn"
+            ? "corepack enable && yarn install"
+            : "npm install";
+    const appTsconfig = `{
   "compilerOptions": {
     "target": "ES2024",
     "module": "Node16",
     "moduleResolution": "Node16",
-    "allowImportingTsExtensions": true,
+    "outDir": "dist",
+    "rootDir": "src",
     "strict": true,
-    "noEmit": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "lib": ["ES2024"],
@@ -172,10 +196,37 @@ MIT
   "include": ["src/**/*"]
 }
 `;
+    const appDevDeps = {
+        tsx: "^4.7.0",
+        typescript: "^5.7.0",
+        "@types/node": "^24.0.0",
+    };
+    // Gateway service
+    const gatewayDeps = [
+        ...RUNTIME_APP_DEPENDENCIES,
+        "@zudojs/http",
+        "@zudojs/config",
+    ];
+    files["apps/gateway/package.json"] =
+        JSON.stringify({
+            name: `${nameSlug}-gateway`,
+            version: "0.1.0",
+            private: true,
+            type: "module",
+            scripts: {
+                dev: "tsx watch src/server.ts",
+                start: "node dist/server.js",
+                build: "tsc",
+                typecheck: "tsc --noEmit",
+            },
+            dependencies: Object.fromEntries([...new Set(gatewayDeps)].map((d) => [d, ZUDOJS_PACKAGES_VERSION])),
+            devDependencies: appDevDeps,
+        }, null, 2) + "\n";
+    files["apps/gateway/tsconfig.json"] = appTsconfig;
     files["apps/gateway/Dockerfile"] = `FROM node:24-alpine AS builder
 WORKDIR /app
-COPY apps/gateway/package*.json ./
-RUN npm ci
+COPY apps/gateway/package.json ./
+RUN ${dockerInstall}
 COPY apps/gateway/tsconfig.json ./
 COPY apps/gateway/src ./src
 RUN npx tsc
@@ -183,106 +234,61 @@ RUN npx tsc
 FROM node:24-alpine AS runtime
 WORKDIR /app
 COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./
 EXPOSE 3000
 CMD ["node", "dist/server.js"]
 `;
     files["apps/gateway/src/index.ts"] =
-        `export { createGateway } from "./app.js";
-`;
-    files["apps/gateway/src/app.ts"] = `import { logger } from "@zudojs/logger";
-
-export async function createGateway() {
-  const log = logger.child({ service: "gateway" });
-  log.info("Gateway starting...");
-
-  return {
-    listen: async () => {
-      log.info("Gateway listening on port 3000");
-    },
-    stop: async () => {
-      log.info("Gateway shutting down...");
-    },
-  };
-}
-`;
-    files["apps/gateway/src/server.ts"] =
-        `import { createGateway } from "./app.js";
-import { createRuntime } from "@zudojs/runtime";
-
-const app = await createGateway();
-
-const runtime = createRuntime({
-  onShutdown: async () => {
-    await app.stop();
-  },
-});
-
-await runtime.start();
-await app.listen();
-
-process.on("SIGTERM", async () => {
-  await runtime.stop();
-  process.exit(0);
-});
+        `export { createApp } from "./app.js";
 `;
+    const gatewayModule = moduleSpec("gateway", "./modules/index.js");
+    files["apps/gateway/src/app.ts"] = renderAppFile({
+        applicationName: `${nameSlug}-gateway`,
+        modules: [gatewayModule],
+        port: 3000,
+    });
+    files["apps/gateway/src/modules/gateway.module.ts"] = renderModuleFile({
+        module: gatewayModule,
+    });
+    files["apps/gateway/src/modules/index.ts"] =
+        `export { ${gatewayModule.className} } from "./gateway.module.js";\n`;
+    files["apps/gateway/src/server.ts"] = renderServerFile();
     // Generate each service
     const serviceDeps = [
-        "@zudojs/core",
-        "@zudojs/container",
+        ...RUNTIME_APP_DEPENDENCIES,
         "@zudojs/config",
-        "@zudojs/logger",
         "@zudojs/errors",
-        "@zudojs/constants",
         "@zudojs/http",
     ];
     if (options.enableCQRS) {
-        serviceDeps.push("@zudojs/cqrs", "@zudojs/events");
+        serviceDeps.push("@zudojs/cqrs");
     }
     for (const svc of services) {
         const svcName = svc;
         const svcIndex = services.indexOf(svcName);
-        const port = 3000 + svcIndex + 1;
+        const port = 3001 + svcIndex;
         files[`apps/services/${svcName}/package.json`] =
             JSON.stringify({
-                name: `@zudojs/${nameSlug}-${svcName}`,
+                name: `${nameSlug}-${svcName}`,
                 version: "0.1.0",
                 private: true,
                 type: "module",
                 scripts: {
-                    dev: "node --import tsx watch src/server.ts",
+                    dev: "tsx watch src/server.ts",
                     start: "node dist/server.js",
                     build: "tsc",
                     typecheck: "tsc --noEmit",
                 },
-                dependencies: Object.fromEntries([...new Set(serviceDeps)].map((d) => [d, "workspace:*"])),
-                devDependencies: {
-                    tsx: "^4.7.0",
-                    typescript: "^5.7.0",
-                    "@types/node": "^22.0.0",
-                },
+                dependencies: Object.fromEntries([...new Set(serviceDeps)].map((d) => [d, ZUDOJS_PACKAGES_VERSION])),
+                devDependencies: appDevDeps,
             }, null, 2) + "\n";
-        files[`apps/services/${svcName}/tsconfig.json`] = `{
-  "compilerOptions": {
-    "target": "ES2024",
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "allowImportingTsExtensions": true,
-    "strict": true,
-    "noEmit": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "lib": ["ES2024"],
-    "types": ["node"]
-  },
-  "include": ["src/**/*"]
-}
-`;
+        files[`apps/services/${svcName}/tsconfig.json`] = appTsconfig;
         files[`apps/services/${svcName}/Dockerfile`] =
             `FROM node:24-alpine AS builder
 WORKDIR /app
-COPY apps/services/${svcName}/package*.json ./
-RUN npm ci
-COPY tsconfig.base.json ../../tsconfig.base.json
+COPY apps/services/${svcName}/package.json ./
+RUN ${dockerInstall}
 COPY apps/services/${svcName}/tsconfig.json ./
 COPY apps/services/${svcName}/src ./src
 RUN npx tsc
@@ -290,6 +296,8 @@ RUN npx tsc
 FROM node:24-alpine AS runtime
 WORKDIR /app
 COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./
 EXPOSE ${port}
 CMD ["node", "dist/server.js"]
 `;
@@ -318,48 +326,18 @@ CMD ["node", "dist/server.js"]
         ];
         files[`apps/services/${svcName}/src/index.ts`] =
             `export { createApp } from "./app.js";
- `;
-        files[`apps/services/${svcName}/src/app.ts`] =
-            `import { logger } from "@zudojs/logger";
- import { createContainer } from "@zudojs/container";
-
- export async function createApp() {
-   const log = logger.child({ service: "${svcName}" });
-   const container = createContainer();
-
-   log.info("${svcName} v0.1.0 starting...");
-
-   return {
-     container,
-     listen: async () => {
-       log.info("Listening on port ${port}");
-     },
-     stop: async () => {
-       log.info("Shutting down...");
-     },
-   };
- }
- `;
-        files[`apps/services/${svcName}/src/server.ts`] =
-            `import { createApp } from "./app.js";
- import { createRuntime } from "@zudojs/runtime";
-
- const app = await createApp();
-
- const runtime = createRuntime({
-   onShutdown: async () => {
-     await app.stop();
-   },
- });
-
- await runtime.start();
- await app.listen();
-
- process.on("SIGTERM", async () => {
-   await runtime.stop();
-   process.exit(0);
- });
- `;
+`;
+        const svcModule = moduleSpec(svcName, "./modules/index.js");
+        files[`apps/services/${svcName}/src/app.ts`] = renderAppFile({
+            applicationName: `${nameSlug}-${svcName}`,
+            modules: [svcModule],
+            port,
+        });
+        files[`apps/services/${svcName}/src/modules/${svcName}.module.ts`] =
+            renderModuleFile({ module: svcModule });
+        files[`apps/services/${svcName}/src/modules/index.ts`] =
+            `export { ${svcModule.className} } from "./${svcName}.module.js";\n`;
+        files[`apps/services/${svcName}/src/server.ts`] = renderServerFile();
         for (const dir of svcDirs) {
             files[`apps/services/${svcName}/src/${dir}/index.ts`] = "";
         }

package/dist/src/templates/modular-monolith/modularMonolith.template.d.ts

@@ -28,7 +28,6 @@
  * ├── tests/
  * ├── package.json
  * ├── tsconfig.json
- * ├── zudojs.config.ts
  * └── README.md
  * ```
  */

package/dist/src/templates/modular-monolith/modularMonolith.template.js

@@ -28,32 +28,38 @@
  * ├── tests/
  * ├── package.json
  * ├── tsconfig.json
- * ├── zudojs.config.ts
  * └── README.md
  * ```
  */
+import { ZUDOJS_PACKAGES_VERSION } from "../../constants/index.js";
+import { normalizeName } from "../../utils/utils.name.js";
+import { RUNTIME_APP_DEPENDENCIES, moduleSpec, renderAppFile, renderModuleFile, renderServerFile, renderPnpmWorkspaceFile, } from "../shared/index.js";
 export function generateModularMonolithFiles(options) {
     const nameSlug = options.projectName
         .replace(/[^a-z0-9-]+/gi, "-")
         .toLowerCase();
-    const modules = options.services.length > 0
+    // Normalized: each name becomes a directory segment and a class name.
+    const modules = (options.services.length > 0
         ? options.services
-        : ["identity", "enrollment", "assessment"];
+        : ["identity", "enrollment", "assessment"])
+        .map((m) => normalizeName(m))
+        .filter((m) => m.length > 0);
     const deps = [
-        "@zudojs/core",
-        "@zudojs/container",
+        ...RUNTIME_APP_DEPENDENCIES,
         "@zudojs/config",
-        "@zudojs/logger",
         "@zudojs/errors",
-        "@zudojs/constants",
         "@zudojs/types",
         "@zudojs/validation",
         "@zudojs/cqrs",
-        "@zudojs/events",
         "@zudojs/messaging",
         "@zudojs/http",
     ];
-    const devDeps = ["tsx", "typescript", "@types/node", "vitest"];
+    const devDeps = {
+        tsx: "^4.7.0",
+        typescript: "^5.7.0",
+        "@types/node": "^24.0.0",
+        vitest: "^3.0.0",
+    };
     const files = {};
     // package.json
     files["package.json"] =
@@ -63,24 +69,29 @@ export function generateModularMonolithFiles(options) {
             private: true,
             type: "module",
             license: "MIT",
+            zudojs: {
+                projectType: "backend",
+                architecture: "modular-monolith",
+                features: [],
+            },
             scripts: {
-                dev: "node --import tsx watch src/server.ts",
+                dev: "tsx watch src/server.ts",
                 start: "node dist/server.js",
                 build: "tsc",
                 typecheck: "tsc --noEmit",
                 test: "vitest run",
             },
-            dependencies: Object.fromEntries(deps.map((d) => [d, "workspace:*"])),
-            devDependencies: Object.fromEntries(devDeps.map((d) => [d, "^1.0.0"])),
+            dependencies: Object.fromEntries([...new Set(deps)].map((d) => [d, ZUDOJS_PACKAGES_VERSION])),
+            devDependencies: devDeps,
         }, null, 2) + "\n";
     files["tsconfig.json"] = `{
   "compilerOptions": {
     "target": "ES2024",
     "module": "Node16",
     "moduleResolution": "Node16",
-    "allowImportingTsExtensions": true,
+    "outDir": "dist",
+    "rootDir": "src",
     "strict": true,
-    "noEmit": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
@@ -91,6 +102,9 @@ export function generateModularMonolithFiles(options) {
   "exclude": ["node_modules", "dist", "**/*.test.ts"]
 }
 `;
+    if (options.packageManager === "pnpm") {
+        files["pnpm-workspace.yaml"] = renderPnpmWorkspaceFile();
+    }
     files[".env.example"] = `NODE_ENV=development
 PORT=3000
 DATABASE_URL=postgresql://localhost:5432/${nameSlug}
@@ -113,7 +127,7 @@ ${modules.map((m) => `- **${m}**`).join("\n")}
 ## Getting Started
 
 \`\`\`bash
-${options.packageManager === "npm" ? "<SECRET_3ff5e0e0> run dev" : options.packageManager === "yarn" ? "yarn dev" : options.packageManager === "bun" ? "bun run dev" : "pnpm run dev"}
+${options.packageManager === "npm" ? "npm run dev" : options.packageManager === "yarn" ? "yarn dev" : options.packageManager === "bun" ? "bun run dev" : "pnpm run dev"}
 \`\`\`
 
 ## License
@@ -123,45 +137,12 @@ MIT
     // Shared source directories
     files["src/index.ts"] = `export { createApp } from "./app.js";
 `;
-    files["src/app.ts"] = `import { logger } from "@zudojs/logger";
-import { createContainer } from "@zudojs/container";
-
-export async function createApp() {
-  const log = logger.child({ service: "app" });
-  const container = createContainer();
-
-  log.info("${nameSlug} v0.1.0 starting...");
-
-  return {
-    container,
-    listen: async () => {
-      log.info("Server started");
-    },
-    stop: async () => {
-      log.info("Shutting down...");
-    },
-  };
-}
-`;
-    files["src/server.ts"] = `import { createApp } from "./app.js";
-import { createRuntime } from "@zudojs/runtime";
-
-const app = await createApp();
-
-const runtime = createRuntime({
-  onShutdown: async () => {
-    await app.stop();
-  },
-});
-
-await runtime.start();
-await app.listen();
-
-process.on("SIGTERM", async () => {
-  await runtime.stop();
-  process.exit(0);
-});
-`;
+    const moduleSpecs = modules.map((m) => moduleSpec(m, `./modules/${m}/index.js`));
+    files["src/app.ts"] = renderAppFile({
+        applicationName: nameSlug,
+        modules: moduleSpecs,
+    });
+    files["src/server.ts"] = renderServerFile();
     const sharedDirs = [
         "configs",
         "constants",
@@ -190,30 +171,15 @@ process.on("SIGTERM", async () => {
     files["src/modules/index.ts"] =
         modules.map((m) => `export * from "./${m}/index.js";`).join("\n") + "\n";
     // Generate each module with CQRS structure
-    for (const mod of modules) {
-        const modName = mod;
-        const modNamePascal = modName
-            .replace(/-([a-z])/g, (_m, c) => c.toUpperCase())
-            .replace(/^./, (c) => c.toUpperCase());
-        files[`src/modules/${modName}/index.ts`] =
-            `export { ${modNamePascal}Module } from "./${modName}.module.js";
-`;
-        files[`src/modules/${modName}/${modName}.module.ts`] =
-            `import { logger } from "@zudojs/logger";
-
-export class ${modNamePascal}Module {
-  private readonly log = logger.child({ module: "${modName}" });
-
-  id = "${modName}-module";
-
-  initialize() {
-    this.log.info("${modName} module initialized");
-  }
-}
-`;
+    for (const spec of moduleSpecs) {
+        files[`src/modules/${spec.name}/index.ts`] =
+            `export { ${spec.className} } from "./${spec.name}.module.js";\n`;
+        files[`src/modules/${spec.name}/${spec.name}.module.ts`] = renderModuleFile({
+            module: spec,
+        });
         // CQRS structure
-        files[`src/modules/${modName}/commands/index.ts`] = ``;
-        files[`src/modules/${modName}/queries/index.ts`] = ``;
+        files[`src/modules/${spec.name}/commands/index.ts`] = ``;
+        files[`src/modules/${spec.name}/queries/index.ts`] = ``;
     }
     files["tests/index.ts"] = `import { describe, it, expect } from "vitest";
 

package/dist/src/templates/monolith/monolith.template.d.ts

@@ -24,6 +24,7 @@
  * │   ├── loggers/
  * │   ├── middlewares/
  * │   ├── models/
+ * │   ├── modules/
  * │   ├── repositories/
  * │   ├── routes/
  * │   ├── services/
@@ -33,7 +34,6 @@
  * ├── tests/
  * ├── package.json
  * ├── tsconfig.json
- * ├── zudojs.config.ts
  * └── README.md
  * ```
  */