@deepstorm/cli 0.10.0 → 0.10.2

package/dist/cli.js

@@ -6570,14 +6570,21 @@ async function runInit(baseDir, opts) {
   const hasNodeBackend = opts.backend === "nodejs";
   const hasBackend = hasJavaBackend || hasNodeBackend;
   try {
-    if (hasFrontend) {
-      renderAngularTemplate(projectDir, ctx);
-    }
-    if (hasJavaBackend) {
-      renderJavaTemplate(projectDir, ctx);
-    }
-    if (hasNodeBackend) {
-      renderNestJSTemplate(projectDir, ctx, opts);
+    const isMonorepo = hasFrontend && hasNodeBackend;
+    if (isMonorepo) {
+      renderAngularTemplate(path2.join(projectDir, "client"), ctx, true);
+      renderNestJSTemplate(path2.join(projectDir, "server"), ctx, opts);
+      renderMonorepoRoot(projectDir, ctx);
+    } else {
+      if (hasFrontend) {
+        renderAngularTemplate(projectDir, ctx);
+      }
+      if (hasJavaBackend) {
+        renderJavaTemplate(projectDir, ctx);
+      }
+      if (hasNodeBackend) {
+        renderNestJSTemplate(projectDir, ctx, opts);
+      }
     }
     renderCommonFiles(projectDir, ctx, opts);
     console.log(`
@@ -6586,9 +6593,15 @@ async function runInit(baseDir, opts) {
     if (!inPlace) {
       console.log(`  cd ${opts.projectName}`);
     }
-    if (opts.frontend) console.log(`  pnpm install        # \u5B89\u88C5\u524D\u7AEF\u4F9D\u8D56`);
-    if (hasJavaBackend) console.log(`  ./gradlew build      # \u6784\u5EFA\u540E\u7AEF`);
-    if (hasNodeBackend) console.log(`  pnpm install         # \u5B89\u88C5\u4F9D\u8D56`);
+    if (isMonorepo) {
+      console.log(`  cd client && pnpm install  # \u5B89\u88C5\u524D\u7AEF\u4F9D\u8D56`);
+      console.log(`  cd server && pnpm install  # \u5B89\u88C5\u540E\u7AEF\u4F9D\u8D56`);
+      console.log(`  pnpm dev                  # \u542F\u52A8\u524D\u540E\u7AEF\u5F00\u53D1\u670D\u52A1\u5668`);
+    } else {
+      if (opts.frontend) console.log(`  pnpm install        # \u5B89\u88C5\u524D\u7AEF\u4F9D\u8D56`);
+      if (hasJavaBackend) console.log(`  ./gradlew build      # \u6784\u5EFA\u540E\u7AEF`);
+      if (hasNodeBackend) console.log(`  pnpm install         # \u5B89\u88C5\u4F9D\u8D56`);
+    }
     console.log();
     printProjectTree(projectDir, hasFrontend, hasJavaBackend, hasNodeBackend);
     if (inPlace) {
@@ -6601,9 +6614,10 @@ async function runInit(baseDir, opts) {
     throw err;
   }
 }
-function renderAngularTemplate(projectDir, ctx) {
+function renderAngularTemplate(projectDir, ctx, subPkg = false) {
   const hasPrimeng = ctx.uiLib === "primeng";
   const hasTailwind = ctx.cssFramework === "tailwind";
+  const webRoot = subPkg ? "src" : "src/main/web";
   writeTemplate(projectDir, "angular.json", JSON.stringify({
     $schema: "./node_modules/@angular/cli/lib/config/schema.json",
     version: 1,
@@ -6612,19 +6626,19 @@ function renderAngularTemplate(projectDir, ctx) {
       [ctx.packageName]: {
         projectType: "application",
         root: "",
-        sourceRoot: "src/main/web",
+        sourceRoot: webRoot,
         prefix: "app",
         architect: {
           build: {
             builder: "@angular-devkit/build-angular:application",
             options: {
               outputPath: "build",
-              index: "src/main/web/index.html",
-              browser: "src/main/web/main.ts",
+              index: `${webRoot}/index.html`,
+              browser: `${webRoot}/main.ts`,
               polyfills: ["zone.js"],
               tsConfig: "tsconfig.app.json",
               assets: [{ glob: "**/*", input: "public" }],
-              styles: getAngularStyles(hasPrimeng),
+              styles: getAngularStyles(hasPrimeng, webRoot),
               scripts: []
             },
             configurations: {
@@ -6641,7 +6655,7 @@ function renderAngularTemplate(projectDir, ctx) {
           },
           test: {
             builder: "@angular-devkit/build-angular:karma",
-            options: { polyfills: ["zone.js", "zone.js/testing"], tsConfig: "tsconfig.spec.json", assets: [{ glob: "**/*", input: "public" }], styles: getAngularStyles(hasPrimeng), scripts: [] }
+            options: { polyfills: ["zone.js", "zone.js/testing"], tsConfig: "tsconfig.spec.json", assets: [{ glob: "**/*", input: "public" }], styles: getAngularStyles(hasPrimeng, webRoot), scripts: [] }
           }
         }
       }
@@ -6679,7 +6693,7 @@ function renderAngularTemplate(projectDir, ctx) {
   writeTemplate(projectDir, "tsconfig.app.json", JSON.stringify({
     extends: "./tsconfig.json",
     compilerOptions: { outDir: "./out-tsc/app", types: [] },
-    files: ["src/main/web/main.ts"],
+    files: [`${webRoot}/main.ts`],
     include: ["src/**/*.d.ts"]
   }, null, 2));
   writeTemplate(projectDir, "tsconfig.spec.json", JSON.stringify({
@@ -6745,8 +6759,8 @@ export default [
 ];
 `);
   ensureDir2(path2.join(projectDir, "public"));
-  ensureDir2(path2.join(projectDir, "src/main/web/app"));
-  writeTemplate(projectDir, "src/main/web/index.html", `<!doctype html>
+  ensureDir2(path2.join(projectDir, webRoot, "app"));
+  writeTemplate(projectDir, `${webRoot}/index.html`, `<!doctype html>
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
@@ -6760,7 +6774,7 @@ export default [
 </body>
 </html>
 `);
-  writeTemplate(projectDir, "src/main/web/main.ts", `import { bootstrapApplication } from '@angular/platform-browser';
+  writeTemplate(projectDir, `${webRoot}/main.ts`, `import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { App } from './app/app';
 
@@ -6771,8 +6785,8 @@ bootstrapApplication(App, appConfig).catch((err) => console.error(err));
 /* \u5168\u5C40\u6837\u5F0F */
 ` : `/* \u5168\u5C40\u6837\u5F0F */
 `;
-  writeTemplate(projectDir, "src/main/web/styles.css", stylesContent);
-  writeTemplate(projectDir, "src/main/web/app/app.ts", `import { Component } from '@angular/core';
+  writeTemplate(projectDir, `${webRoot}/styles.css`, stylesContent);
+  writeTemplate(projectDir, `${webRoot}/app/app.ts`, `import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 
 @Component({
@@ -6783,7 +6797,7 @@ import { RouterOutlet } from '@angular/router';
 })
 export class App {}
 `);
-  writeTemplate(projectDir, "src/main/web/app/app.config.ts", `import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+  writeTemplate(projectDir, `${webRoot}/app/app.config.ts`, `import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
 import { provideRouter } from '@angular/router';
 import { routes } from './app.routes';
 
@@ -6794,7 +6808,7 @@ export const appConfig: ApplicationConfig = {
   ],
 };
 `);
-  writeTemplate(projectDir, "src/main/web/app/app.routes.ts", `import { Routes } from '@angular/router';
+  writeTemplate(projectDir, `${webRoot}/app/app.routes.ts`, `import { Routes } from '@angular/router';
 
 export const routes: Routes = [];
 `);
@@ -6804,14 +6818,33 @@ export const routes: Routes = [];
     }, null, 2));
   }
 }
-function getAngularStyles(hasPrimeng) {
+function getAngularStyles(hasPrimeng, webRoot) {
   const styles = [];
   if (hasPrimeng) {
     styles.push("@primeng/themes/aura/aura.css");
   }
-  styles.push("src/main/web/styles.css");
+  styles.push(`${webRoot}/styles.css`);
   return styles;
 }
+function renderMonorepoRoot(projectDir, ctx) {
+  writeTemplate(projectDir, "package.json", JSON.stringify({
+    name: ctx.packageName,
+    version: "0.1.0",
+    private: true,
+    description: "",
+    scripts: {
+      dev: "pnpm --filter server dev & pnpm --filter client dev",
+      build: "pnpm --filter server build",
+      lint: "pnpm --filter server lint",
+      format: "pnpm --filter server format",
+      test: "pnpm --filter server test"
+    }
+  }, null, 2));
+  writeTemplate(projectDir, "pnpm-workspace.yaml", `packages:
+  - "server"
+  - "client"
+`);
+}
 function renderJavaTemplate(projectDir, ctx) {
   const hasOrm = ctx.orm === "hibernate";
   const hasLiquibase = ctx.migration === "liquibase";
@@ -7511,14 +7544,22 @@ function generateReadme(ctx, opts) {
   }
   lines.push("");
   lines.push("## \u5FEB\u901F\u5F00\u59CB", "");
-  if (ctx.frontend) {
+  if (ctx.frontend && hasNodeBackend) {
+    lines.push("```bash");
+    lines.push("# \u5B89\u88C5\u6240\u6709\u4F9D\u8D56");
+    lines.push("pnpm install");
+    lines.push("");
+    lines.push("# \u542F\u52A8\u524D\u540E\u7AEF\u5F00\u53D1\u670D\u52A1\u5668");
+    lines.push("pnpm dev");
+    lines.push("```", "");
+  } else if (ctx.frontend) {
     lines.push("### \u524D\u7AEF", "");
     lines.push("```bash");
     lines.push("pnpm install");
     lines.push("pnpm start");
     lines.push("```", "");
   }
-  if (hasNodeBackend) {
+  if (hasNodeBackend && !ctx.frontend) {
     lines.push("### \u540E\u7AEF", "");
     lines.push("```bash");
     lines.push("pnpm install");
@@ -7534,10 +7575,16 @@ function generateReadme(ctx, opts) {
   lines.push("## \u9879\u76EE\u7ED3\u6784", "");
   lines.push("```");
   if (ctx.frontend && hasNodeBackend) {
-    lines.push("\u251C\u2500\u2500 src/                    # NestJS + Angular");
-    lines.push("\u251C\u2500\u2500 angular.json           # Angular \u914D\u7F6E");
-    lines.push("\u251C\u2500\u2500 nest-cli.json          # NestJS \u914D\u7F6E");
-    lines.push("\u251C\u2500\u2500 tsconfig.json");
+    lines.push("\u251C\u2500\u2500 server/                 # NestJS \u540E\u7AEF");
+    lines.push("\u2502   \u251C\u2500\u2500 src/");
+    lines.push("\u2502   \u251C\u2500\u2500 nest-cli.json");
+    lines.push("\u2502   \u2514\u2500\u2500 package.json");
+    lines.push("\u251C\u2500\u2500 client/                 # Angular \u524D\u7AEF");
+    lines.push("\u2502   \u251C\u2500\u2500 src/");
+    lines.push("\u2502   \u251C\u2500\u2500 public/");
+    lines.push("\u2502   \u251C\u2500\u2500 angular.json");
+    lines.push("\u2502   \u2514\u2500\u2500 package.json");
+    lines.push("\u251C\u2500\u2500 pnpm-workspace.yaml");
     lines.push("\u2514\u2500\u2500 package.json");
   } else if (ctx.frontend && ctx.backend) {
     lines.push("\u251C\u2500\u2500 src/main/web/          # Angular \u524D\u7AEF");
@@ -7600,19 +7647,33 @@ function printProjectTree(projectDir, hasFrontend, hasJavaBackend, hasNodeBacken
     console.log("  \u251C\u2500\u2500 angular.json");
     console.log("  \u2514\u2500\u2500 package.json");
   } else if (hasFrontend && hasNodeBackend) {
-    console.log("  \u251C\u2500\u2500 src/");
-    console.log("  \u2502   \u251C\u2500\u2500 app.controller.ts");
-    console.log("  \u2502   \u251C\u2500\u2500 app.module.ts");
-    console.log("  \u2502   \u251C\u2500\u2500 app.service.ts");
-    console.log("  \u2502   \u251C\u2500\u2500 main.ts");
-    console.log("  \u2502   \u251C\u2500\u2500 prisma/          # Prisma ORM");
-    console.log("  \u2502   \u2514\u2500\u2500 agent/           # Claude Agent SDK");
-    console.log("  \u251C\u2500\u2500 prisma/");
-    console.log("  \u2502   \u2514\u2500\u2500 schema.prisma");
-    console.log("  \u251C\u2500\u2500 nest-cli.json");
-    console.log("  \u251C\u2500\u2500 tsconfig.json");
-    console.log("  \u251C\u2500\u2500 angular.json");
-    console.log("  \u2514\u2500\u2500 package.json");
+    console.log("  \u251C\u2500\u2500 server/                 # NestJS \u540E\u7AEF");
+    console.log("  \u2502   \u251C\u2500\u2500 src/");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 app.controller.ts");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 app.module.ts");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 app.service.ts");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 main.ts");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 prisma/       # Prisma ORM");
+    console.log("  \u2502   \u2502   \u2514\u2500\u2500 agent/        # Claude Agent SDK");
+    console.log("  \u2502   \u251C\u2500\u2500 prisma/");
+    console.log("  \u2502   \u2502   \u2514\u2500\u2500 schema.prisma");
+    console.log("  \u2502   \u251C\u2500\u2500 nest-cli.json");
+    console.log("  \u2502   \u251C\u2500\u2500 tsconfig.json");
+    console.log("  \u2502   \u2514\u2500\u2500 package.json");
+    console.log("  \u251C\u2500\u2500 client/                 # Angular \u524D\u7AEF");
+    console.log("  \u2502   \u251C\u2500\u2500 src/");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 index.html");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 main.ts");
+    console.log("  \u2502   \u2502   \u251C\u2500\u2500 styles.css");
+    console.log("  \u2502   \u2502   \u2514\u2500\u2500 app/");
+    console.log("  \u2502   \u251C\u2500\u2500 public/");
+    console.log("  \u2502   \u251C\u2500\u2500 angular.json");
+    console.log("  \u2502   \u251C\u2500\u2500 tsconfig.json");
+    console.log("  \u2502   \u2514\u2500\u2500 package.json");
+    console.log("  \u251C\u2500\u2500 pnpm-workspace.yaml");
+    console.log("  \u251C\u2500\u2500 package.json");
+    console.log("  \u251C\u2500\u2500 .env");
+    console.log("  \u2514\u2500\u2500 .gitignore");
   } else if (hasFrontend) {
     console.log("  \u251C\u2500\u2500 src/main/web/         # Angular \u524D\u7AEF");
     console.log("  \u251C\u2500\u2500 angular.json");

package/dist/registry.json

@@ -104,7 +104,7 @@
                     "buildTool": "pnpm:*",
                     "formatCmd": "pnpm",
                     "fileExt": "*.component.ts / *.service.ts / *.ts",
-                    "sourcePath": "src/main/web/",
+                    "sourcePath": "client/src/",
                     "styleRef": "→ 参考 [Angular 前端速查](quick-reference.md)"
                   },
                   "affectedTemplates": [
@@ -405,7 +405,7 @@
                 "buildTool": "pnpm:*",
                 "formatCmd": "npx eslint",
                 "fileExt": "*.ts",
-                "sourcePath": "src/ test/",
+                "sourcePath": "server/src/ server/test/",
                 "styleRef": "→ 参考 [Node.js NestJS 后端速查](quick-reference.md)"
               },
               "availableAiFrameworks": [

package/dist/skills/reef-gen-backend/variants/nodejs/steps.md

@@ -35,19 +35,19 @@
 ## 构建命令
 
 ```bash
-# 依赖安装
+# 依赖安装（在项目根目录执行）
 pnpm install
 
-# Prisma 客户端生成
-npx prisma generate
+# Prisma 客户端生成（在 server/ 目录执行）
+cd server && npx prisma generate
 
 # 代码检查
-npx eslint src/ --ext .ts
-npx prettier --check src/
+cd server && npx eslint src/ --ext .ts
+cd server && npx prettier --check src/
 
 # 测试
-npx jest
+cd server && npx jest
 
 # 构建
-npx nest build
+cd server && npx nest build
 ```

package/dist/skills/reef-style-backend/variants/nodejs/quick-reference.md

@@ -79,30 +79,31 @@ export class ToolsModule {}
 ## 项目目录结构
 
 ```
-src/
+server/src/
 ├── main.ts                   # 入口文件
 ├── app.module.ts             # 根模块
 ├── app.controller.ts         # 根 Controller（健康检查）
 ├── prisma/
 │   ├── prisma.module.ts      # Prisma 全局模块
 │   └── prisma.service.ts     # Prisma Client 封装
-├── modules/
-│   └── {module}/
-│       ├── {module}.module.ts
-│       ├── {module}.controller.ts
-│       ├── {module}.service.ts
-│       ├── dto/
-│       │   ├── create-{entity}.dto.ts
-│       │   └── update-{entity}.dto.ts
-│       └── entities/
-│           └── {entity}.entity.ts   # Prisma 生成类型的二次封装（可选）
 ├── common/
-│   ├── filters/              # 全局异常过滤器
-│   ├── pipes/                # 全局管道
-│   ├── interceptors/         # 全局拦截器
-│   └── guards/               # 全局守卫
-└── config/
-    └── configuration.ts      # 配置模块
+│   ├── guards/               # 认证/授权守卫
+│   ├── interceptors/         # 请求拦截器
+│   ├── filters/              # 异常过滤器
+│   ├── pipes/                # 管道校验
+│   └── decorators/           # 自定义装饰器
+├── config/
+│   └── app.config.ts         # 应用配置
+└── modules/
+    └── {module}/
+        ├── {module}.module.ts
+        ├── {module}.controller.ts
+        ├── {module}.service.ts
+        ├── dto/
+        │   ├── create-{entity}.dto.ts
+        │   └── update-{entity}.dto.ts
+        └── entities/
+            └── {entity}.entity.ts   # Prisma 生成类型的二次封装（可选）
 ```
 
 ## 常见坑

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepstorm/cli",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "DeepStorm CLI — 一键配置项目开发环境",
   "license": "MIT",
   "author": "billkang",
@@ -16,7 +16,7 @@
     "dotenv": "^17.4.2",
     "handlebars": "^4.7.8",
     "js-yaml": "^4.1.0",
-    "@deepstorm/pilot": "^0.10.0"
+    "@deepstorm/pilot": "^0.10.2"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",