@gadmin2n/cli 0.0.84 → 0.0.85

package/actions/prisma.action.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrismaAction = void 0;
 const chalk = require("chalk");
 const fs = require("fs");
+const path_1 = require("path");
 const abstract_action_1 = require("./abstract.action");
 const shell = require("shelljs");
 const readline = require("readline");
@@ -99,7 +100,10 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             // 清空 generated 目录（按模式选择）
             if (webOnly) {
                 // 只清 server/src/generated/.react（清理旧 react 输出）
-                fs.rmSync('server/src/generated/.react', { recursive: true, force: true });
+                fs.rmSync('server/src/generated/.react', {
+                    recursive: true,
+                    force: true,
+                });
             }
             else if (serverOnly) {
                 // 只清 server/src/generated/
@@ -129,7 +133,10 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                     recursive: true,
                     force: true,
                 });
-                fs.rmSync('server/src/generated/.react', { recursive: true, force: true });
+                fs.rmSync('server/src/generated/.react', {
+                    recursive: true,
+                    force: true,
+                });
                 // pages 目录可能因所有模型都已存在而未生成，需判断后再复制
                 if (fs.existsSync('web/src/generated/routes')) {
                     fs.cpSync('web/src/generated/routes', 'web/src/routes', {
@@ -154,14 +161,20 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                     shell.mv('-f', `server/src/generated/${modelName}/dto/${modelName}.form.validator.ts`, `web/src/generated/props/${modelName}/form.validator.ts`);
                     fs.cpSync(`server/src/generated/${modelName}`, `server/src/modules/${modelName}`, { recursive: true, force: false });
                     shell.rm('-f', `server/src/generated/${modelName}/*.ts`);
-                    fs.rmSync(`server/src/modules/${modelName}/dto`, {
-                        recursive: true,
-                        force: true,
-                    });
-                    fs.rmSync(`server/src/modules/${modelName}/entities`, {
-                        recursive: true,
-                        force: true,
-                    });
+                    // 只删除生成器产生的 dto/entities 文件，保留用户自定义的文件（如 canvas.dto.ts）
+                    for (const subDir of ['dto', 'entities']) {
+                        const generatedSubDir = `server/src/generated/${modelName}/${subDir}`;
+                        const modulesSubDir = `server/src/modules/${modelName}/${subDir}`;
+                        if (fs.existsSync(modulesSubDir) && fs.existsSync(generatedSubDir)) {
+                            for (const file of fs.readdirSync(generatedSubDir)) {
+                                fs.rmSync((0, path_1.join)(modulesSubDir, file), { force: true });
+                            }
+                            // 目录已空则一并删除
+                            if (fs.readdirSync(modulesSubDir).length === 0) {
+                                fs.rmdirSync(modulesSubDir);
+                            }
+                        }
+                    }
                 });
             }
             // 更新 Prisma 类型文件（!webOnly）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "@angular-devkit/core": "13.3.2",
     "@angular-devkit/schematics": "13.3.2",
     "@angular-devkit/schematics-cli": "13.3.2",
-    "@gadmin2n/schematics": "^0.0.67",
+    "@gadmin2n/schematics": "^0.0.68",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",