zudojs-cli 2.0.0 → 2.1.0

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

@@ -21,9 +21,12 @@
  * └── README.md
  * ```
  */
-import { ZUDOJS_PACKAGES_VERSION } from "../../constants/index.js";
+import { renderDatabaseEnv } from "../../adapters/databases/databaseAdapter.resolver.js";
+import { zudojsDependencies } from "../../constants/index.js";
 import { normalizeName } from "../../utils/utils.name.js";
-import { RUNTIME_APP_DEPENDENCIES, capabilityPackages, moduleSpec, renderAppPackageDockerfile, renderAppFile, renderModuleFile, renderServerFile, renderPnpmWorkspaceFile, resolveProjectCapabilities, } from "../shared/index.js";
+import { RUNTIME_APP_DEPENDENCIES, capabilityPackages, moduleSpec, renderAppPackageDockerfile, renderModuleFile, renderPnpmWorkspaceFile, resolveProjectCapabilities, } from "../shared/index.js";
+import { DEPENDENCY_VERSION_RANGES, TYPESCRIPT_VERSION_RANGES, } from "../../resolvers/dependency/dependencyVersions.constant.js";
+import { APP_SOURCE_DEPENDENCIES, APP_TEST_DEPENDENCIES, applyDatabaseSetting, backendDevDependencies, emptyBarrels, renderBackendAppSource, } from "../backendApp/index.js";
 /**
  * The gateway app is always generated at `apps/gateway`, so "gateway" is a
  * reserved name: a service called `gateway` would produce a second, competing
@@ -39,7 +42,10 @@ export const RESERVED_MICROSERVICE_APP_NAMES = ["gateway"];
  * (`identity`, `enrollment`, `assessment`, `notification`), which put four
  * domains nobody asked for into every microservice project and left the
  * author deleting them before they could start. Services are created when
- * they are named — here, or later with `zudojs generate service <name>`.
+ * they are named — here, or in another `create` run. `generate service` is
+ * refused in a microservice project, because a service is a whole workspace
+ * app (package.json, tsconfig, Dockerfile, port) that the schematic does not
+ * produce; `generate module --service <name>` adds to an existing app.
  */
 export function resolveMicroserviceServices(requested) {
     const normalized = requested
@@ -54,9 +60,9 @@ export function generateMicroserviceFiles(options) {
         .toLowerCase();
     const services = resolveMicroserviceServices(options.services);
     // The workspace root records the capabilities for the project as a whole
-    // (`zudojs info` reads it when there is no manifest); the service apps
-    // record them next to the dependencies that back them, which is where
-    // `zudojs add` writes and `zudojs doctor` reads.
+    // alongside the manifest, and `zudojs add` keeps the two in step); the
+    // gateway and service apps record them next to the dependencies that back
+    // them, which is where `zudojs add` writes and `zudojs doctor` reads.
     const capabilities = resolveProjectCapabilities(options);
     const files = {};
     // Root package.json (workspace root)
@@ -82,6 +88,13 @@ export function generateMicroserviceFiles(options) {
                 : options.packageManager === "bun"
                     ? "bun run --filter '*' typecheck"
                     : "pnpm -r run typecheck",
+        test: options.packageManager === "npm"
+            ? "npm run test --workspaces --if-present"
+            : options.packageManager === "yarn"
+                ? "yarn workspaces run test"
+                : options.packageManager === "bun"
+                    ? "bun run --filter '*' test"
+                    : "pnpm -r run test",
     };
     const workspaceGlobs = ["apps/gateway", "apps/services/*"];
     files["package.json"] =
@@ -101,8 +114,8 @@ export function generateMicroserviceFiles(options) {
                 : { workspaces: workspaceGlobs }),
             scripts: rootScripts,
             devDependencies: {
-                tsx: "^4.7.0",
-                typescript: "^5.7.0",
+                tsx: DEPENDENCY_VERSION_RANGES.tsx,
+                typescript: TYPESCRIPT_VERSION_RANGES.backend,
             },
         }, null, 2) + "\n";
     if (options.packageManager === "pnpm") {
@@ -158,10 +171,17 @@ A microservice architecture built with the Zudojs framework.
 ${services.length > 0
         ? services.map((s, i) => `- **${s}** - Port ${3001 + i}`).join("\n")
         : `
-No services yet. Add one with:
+No services yet. A service is a whole workspace app, so it is created with
+\`create\` rather than by a schematic:
+
+\`\`\`bash
+npx zudojs create <project> --architecture microservice --services <name>
+\`\`\`
+
+To add domain logic to an app that already exists, generate a module into it:
 
 \`\`\`bash
-npx zudojs generate service <name>
+npx zudojs generate module <name> --service <existing-service>
 \`\`\``}
 
 ## Getting Started
@@ -202,15 +222,45 @@ MIT
 }
 `;
     const appDevDeps = {
-        tsx: "^4.7.0",
-        typescript: "^5.7.0",
-        "@types/node": "^24.0.0",
+        ...backendDevDependencies(),
+        ...zudojsDependencies(APP_TEST_DEPENDENCIES),
     };
-    // Gateway service
+    const appScripts = {
+        dev: "tsx watch src/server.ts",
+        start: "node dist/server.js",
+        build: "tsc",
+        typecheck: "tsc --noEmit",
+        test: "vitest run",
+    };
+    /** The wired source tree of one app, plus its folder barrels. */
+    const appSource = (appName, port) => {
+        const spec = moduleSpec(appName, "./modules/index.js");
+        return {
+            ...emptyBarrels(),
+            ...applyDatabaseSetting(renderBackendAppSource({
+                applicationName: `${nameSlug}-${appName}`,
+                title: `${options.projectName} ${appName}`,
+                defaultPort: port,
+                openapi: options.enableOpenAPI === true,
+                modules: [spec],
+                port,
+            }), renderDatabaseEnv(options.database, `${nameSlug}-${appName}`)),
+            [`src/modules/${appName}.module.ts`]: renderModuleFile({ module: spec }),
+            "src/modules/index.ts": `export { ${spec.className} } from "./${appName}.module.js";\n`,
+        };
+    };
+    const prefixed = (prefix, tree) => {
+        for (const [path, content] of Object.entries(tree)) {
+            files[`${prefix}/${path}`] = content;
+        }
+    };
+    // Gateway service. It is a backend app like every service: `create` and
+    // `zudojs add` write capabilities to it and `zudojs doctor` checks it, so
+    // it declares and installs the same capabilities.
     const gatewayDeps = [
         ...RUNTIME_APP_DEPENDENCIES,
-        "@zudojs/http",
-        "@zudojs/config",
+        ...APP_SOURCE_DEPENDENCIES,
+        ...capabilityPackages(capabilities),
     ];
     files["apps/gateway/package.json"] =
         JSON.stringify({
@@ -218,13 +268,9 @@ MIT
             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])),
+            zudojs: { features: capabilities },
+            scripts: appScripts,
+            dependencies: zudojsDependencies(gatewayDeps),
             devDependencies: appDevDeps,
         }, null, 2) + "\n";
     files["apps/gateway/tsconfig.json"] = appTsconfig;
@@ -233,27 +279,11 @@ MIT
         port: 3000,
         packageManager: options.packageManager,
     });
-    files["apps/gateway/src/index.ts"] =
-        `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();
+    prefixed("apps/gateway", appSource("gateway", 3000));
     // Generate each service
     const serviceDeps = [
         ...RUNTIME_APP_DEPENDENCIES,
-        "@zudojs/config",
-        "@zudojs/errors",
-        "@zudojs/http",
+        ...APP_SOURCE_DEPENDENCIES,
         ...capabilityPackages(capabilities),
     ];
     for (const svc of services) {
@@ -267,13 +297,8 @@ MIT
                 private: true,
                 type: "module",
                 zudojs: { features: capabilities },
-                scripts: {
-                    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, ZUDOJS_PACKAGES_VERSION])),
+                scripts: appScripts,
+                dependencies: zudojsDependencies(serviceDeps),
                 devDependencies: appDevDeps,
             }, null, 2) + "\n";
         files[`apps/services/${svcName}/tsconfig.json`] = appTsconfig;
@@ -282,48 +307,7 @@ MIT
             port,
             packageManager: options.packageManager,
         });
-        // Service structure (modular monolith per service)
-        const svcDirs = [
-            "configs",
-            "constants",
-            "controllers",
-            "databases",
-            "dtos",
-            "enums",
-            "errors",
-            "events",
-            "interfaces",
-            "jobs",
-            "loaders",
-            "loggers",
-            "middlewares",
-            "models",
-            "repositories",
-            "routes",
-            "services",
-            "types",
-            "utils",
-            "validators",
-        ];
-        files[`apps/services/${svcName}/src/index.ts`] =
-            `export { createApp } from "./app.js";
-`;
-        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("./app.js", {
-            defaultPort: port,
-        });
-        for (const dir of svcDirs) {
-            files[`apps/services/${svcName}/src/${dir}/index.ts`] = "";
-        }
+        prefixed(`apps/services/${svcName}`, appSource(svcName, port));
         files[`apps/services/${svcName}/src/commands/index.ts`] = "";
         files[`apps/services/${svcName}/src/queries/index.ts`] = "";
     }

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

@@ -32,9 +32,10 @@
  * ```
  */
 import { renderDatabaseEnv } from "../../adapters/databases/databaseAdapter.resolver.js";
-import { ZUDOJS_PACKAGES_VERSION } from "../../constants/index.js";
+import { zudojsDependencies } from "../../constants/index.js";
 import { normalizeName } from "../../utils/utils.name.js";
-import { RUNTIME_APP_DEPENDENCIES, capabilityPackages, moduleSpec, renderAppFile, renderModuleFile, renderServerFile, renderPnpmWorkspaceFile, resolveProjectCapabilities, } from "../shared/index.js";
+import { RUNTIME_APP_DEPENDENCIES, capabilityPackages, moduleSpec, renderModuleFile, renderPnpmWorkspaceFile, resolveProjectCapabilities, } from "../shared/index.js";
+import { APP_SOURCE_DEPENDENCIES, APP_TEST_DEPENDENCIES, applyDatabaseSetting, backendDevDependencies, backendTsconfig, emptyBarrels, renderBackendAppSource, runCommand, } from "../backendApp/index.js";
 export function generateModularMonolithFiles(options) {
     const nameSlug = options.projectName
         .replace(/[^a-z0-9-]+/gi, "-")
@@ -55,21 +56,13 @@ export function generateModularMonolithFiles(options) {
     const capabilities = resolveProjectCapabilities(options);
     const deps = [
         ...RUNTIME_APP_DEPENDENCIES,
-        "@zudojs/config",
-        "@zudojs/errors",
+        ...APP_SOURCE_DEPENDENCIES,
         "@zudojs/types",
         "@zudojs/validation",
         "@zudojs/cqrs",
         "@zudojs/messaging",
-        "@zudojs/http",
         ...capabilityPackages(capabilities),
     ];
-    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"] =
@@ -91,34 +84,16 @@ export function generateModularMonolithFiles(options) {
                 typecheck: "tsc --noEmit",
                 test: "vitest run",
             },
-            dependencies: Object.fromEntries([...new Set(deps)].map((d) => [d, ZUDOJS_PACKAGES_VERSION])),
-            devDependencies: devDeps,
+            dependencies: zudojsDependencies(deps),
+            devDependencies: {
+                ...backendDevDependencies(),
+                ...zudojsDependencies(APP_TEST_DEPENDENCIES),
+            },
         }, null, 2) + "\n";
-    files["tsconfig.json"] = `{
-  "compilerOptions": {
-    "target": "ES2024",
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "outDir": "dist",
-    "rootDir": "src",
-    "strict": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "lib": ["ES2024"],
-    "types": ["node"]
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts"]
-}
-`;
+    files["tsconfig.json"] = backendTsconfig();
     if (options.packageManager === "pnpm") {
         files["pnpm-workspace.yaml"] = renderPnpmWorkspaceFile();
     }
-    files[".env.example"] = `NODE_ENV=development
-PORT=3000
-${renderDatabaseEnv(options.database, nameSlug)}
-`;
     files[".gitignore"] = `node_modules/
 dist/
 .env
@@ -142,50 +117,33 @@ ${modules.map((m) => `- **${m}**`).join("\n")}`
 npx zudojs generate module <name>
 \`\`\``}
 
+Each module owns \`src/modules/<name>/routes/index.ts\`, registered from
+\`src/routes/index.ts\`. Add a resource to a module with:
+
+\`\`\`bash
+npx zudojs generate resource invoices --module <name>
+\`\`\`
+
 ## Getting Started
 
 \`\`\`bash
-${options.packageManager === "npm" ? "npm run dev" : options.packageManager === "yarn" ? "yarn dev" : options.packageManager === "bun" ? "bun run dev" : "pnpm run dev"}
+cp .env.example .env
+${runCommand(options.packageManager, "dev")}
 \`\`\`
 
 ## License
 
 MIT
-`;
-    // Shared source directories
-    files["src/index.ts"] = `export { createApp } from "./app.js";
 `;
     const moduleSpecs = modules.map((m) => moduleSpec(m, `./modules/${m}/index.js`));
-    files["src/app.ts"] = renderAppFile({
+    Object.assign(files, emptyBarrels(), applyDatabaseSetting(renderBackendAppSource({
         applicationName: nameSlug,
+        title: options.projectName,
+        defaultPort: 3000,
+        openapi: options.enableOpenAPI === true,
         modules: moduleSpecs,
-    });
-    files["src/server.ts"] = renderServerFile();
-    const sharedDirs = [
-        "configs",
-        "constants",
-        "controllers",
-        "databases",
-        "dtos",
-        "enums",
-        "errors",
-        "events",
-        "interfaces",
-        "jobs",
-        "loaders",
-        "loggers",
-        "middlewares",
-        "models",
-        "repositories",
-        "routes",
-        "services",
-        "types",
-        "utils",
-        "validators",
-    ];
-    for (const dir of sharedDirs) {
-        files[`src/${dir}/index.ts`] = "";
-    }
+        routedModules: modules,
+    }), renderDatabaseEnv(options.database, nameSlug)));
     files["src/modules/index.ts"] =
         modules.map((m) => `export * from "./${m}/index.js";`).join("\n") + "\n";
     // Generate each module with CQRS structure
@@ -199,16 +157,6 @@ MIT
         files[`src/modules/${spec.name}/commands/index.ts`] = ``;
         files[`src/modules/${spec.name}/queries/index.ts`] = ``;
     }
-    // The name must match vitest's default `include`
-    // (`**/*.{test,spec}.?(c|m)[jt]s?(x)`); `tests/index.ts` did not.
-    files["tests/app.test.ts"] = `import { describe, it, expect } from "vitest";
-
-describe("Application", () => {
-  it("should bootstrap correctly", () => {
-    expect(true).toBe(true);
-  });
-});
-`;
     return files;
 }
 //# sourceMappingURL=modularMonolith.template.js.map

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

@@ -3,35 +3,20 @@
  *
  * Template file generators for monolith architecture projects.
  *
- * Generated structure:
+ * Generated structure (see `templates/backendApp` for the wired source):
  * ```
  * project/
  * ├── src/
- * │   ├── index.ts      # exports only
- * │   ├── app.ts        # application assembly
- * │   ├── server.ts     # entry point
- * │   ├── configs/
- * │   ├── constants/
- * │   ├── controllers/
- * │   ├── databases/
- * │   ├── dtos/
- * │   ├── enums/
- * │   ├── errors/
- * │   ├── events/
- * │   ├── interfaces/
- * │   ├── jobs/
- * │   ├── loaders/
- * │   ├── loggers/
- * │   ├── middlewares/
- * │   ├── models/
- * │   ├── modules/
- * │   ├── repositories/
- * │   ├── routes/
- * │   ├── services/
- * │   ├── types/
- * │   ├── utils/
- * │   └── validators/
- * ├── tests/
+ * │   ├── index.ts        # exports only
+ * │   ├── app.ts          # runtime assembly (modules + integrations)
+ * │   ├── server.ts       # config → router → registerRoutes → HTTP
+ * │   ├── container.ts    # composition root
+ * │   ├── configs/        # typed configuration from the environment
+ * │   ├── controllers/  dtos/  repositories/  services/  routes/
+ * │   ├── integrations/   # lifecycle-managed clients (zudojs add)
+ * │   ├── modules/        # runtime modules
+ * │   └── utils/          # HTTP helpers
+ * ├── tests/examples.test.ts
  * ├── package.json
  * ├── tsconfig.json
  * └── README.md