@gadmin2n/cli 0.0.159 → 0.0.161

package/actions/prisma.action.js

@@ -51,36 +51,37 @@ function replaceFileContent(filePath, match, src, dest) {
 }
 class PrismaAction extends abstract_action_1.AbstractAction {
     buildMergedSchema() {
-        shell
-            .cat('server/prisma/.generator.prisma')
-            .to('server/prisma/schema.prisma');
+        // 读 generator 头
+        const generatorHead = fs.readFileSync('server/prisma/.generator.prisma', 'utf8');
+        // 读用户 schema 源
         let schemaStr = '';
         if (shell.test('-d', 'config/prisma')) {
-            schemaStr = shell.cat('config/prisma/*.prisma');
+            schemaStr = shell.cat('config/prisma/*.prisma').toString();
         }
         else {
-            schemaStr = shell.cat('config/schema.prisma');
+            schemaStr = shell.cat('config/schema.prisma').toString();
         }
         const schemaRegex = /([\s\S]*?model\s\w*\s*\{)([^\}]*)(\})/gim; // https://regex101.com/
-        let m, result = '';
+        let m, merged = '';
         while ((m = schemaRegex.exec(schemaStr)) !== null) {
             // This is necessary to avoid infinite loops with zero-width matches
             if (m.index === schemaRegex.lastIndex) {
                 schemaRegex.lastIndex++;
             }
             let ignore = !!m[1].match(/\/\/\/\s*@IgnoreAutoField/);
-            result += m[1];
+            merged += m[1];
             if (!ignore) {
-                result += '\n  id BigInt @id @default(autoincrement())';
+                merged += '\n  id BigInt @id @default(autoincrement())';
             }
-            result += m[2];
+            merged += m[2];
             if (!ignore) {
-                result +=
+                merged +=
                     '  creator String @db.VarChar(128) @map("creator")\n  createdAt DateTime @default(now()) @map("created_at")\n  updatedAt DateTime @updatedAt @default(now()) @map("updated_at")\n';
             }
-            result += m[3];
+            merged += m[3];
         }
-        new shell.ShellString(result).toEnd('server/prisma/schema.prisma');
+        // 一次原子写 + diff：内容未变则完全不 touch 文件，避免任何 watcher 感知抖动。
+        return (0, sync_fs_1.writeFileIfChanged)('server/prisma/schema.prisma', generatorHead + merged);
     }
     handle(inputs, options) {
         var _a, _b;
@@ -97,7 +98,10 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             const verbose = !!((_b = options.find((option) => option.name === 'verbose')) === null || _b === void 0 ? void 0 : _b.value);
             // 分发过程按类别记账，收尾统一打摘要 / --verbose 打完整清单
             const stats = {
-                serverModulesIndex: [],
+                serverGeneratedIndex: [],
+                serverGenerated: [],
+                serverGeneratedUnchanged: [],
+                serverGeneratedOrphans: [],
                 serverModulesNew: [],
                 serverModulesSkipped: [],
                 routesNew: [],
@@ -143,7 +147,8 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             //   SERVER_STAGING/
             //     modules.index.ts                            → diff-copy 到 server/src/generated/modules.index.ts
             //     {model}/dto/{model}.form.validator.ts       → diff-copy 到 web/src/generated/props/{model}/form.validator.ts（跨端）
-            //     {model}/**（其余）                             → 首次落地到 server/src/modules/{model}/**
+            //     {model}/dto/**（其余）, {model}/entities/**  → diff-copy 到 server/src/generated/{model}/**（权威、可被覆盖）
+            //     {model}/**（其余：controller/service/module/spec） → 首次落地到 server/src/modules/{model}/**（保护用户编辑）
             // 收集 server staging 里的 model 列表：凡有 dto/{name}.form.validator.ts 的一级子目录即视为 model
             const stagingModels = fs.existsSync(SERVER_STAGING)
                 ? fs
@@ -153,32 +158,55 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                     .filter((name) => fs.existsSync((0, path_1.join)(SERVER_STAGING, name, 'dto', `${name}.form.validator.ts`)))
                 : [];
             // ============ 阶段 1：server 集中写入 ============
+            const serverGeneratedKeep = new Set();
             if (fs.existsSync(SERVER_STAGING)) {
-                // 1.1 modules.index.ts —— 顶层入口
+                // 1.1 modules.index.ts —— 顶层入口（放在 generated 下的顶级文件）
                 const modulesIndexSrc = (0, path_1.join)(SERVER_STAGING, 'modules.index.ts');
                 if (fs.existsSync(modulesIndexSrc)) {
-                    const rel = 'server/src/generated/modules.index.ts';
-                    if ((0, sync_fs_1.copyFileIfChanged)(modulesIndexSrc, rel)) {
-                        stats.serverModulesIndex.push(rel);
+                    const rel = 'modules.index.ts';
+                    const dest = (0, path_1.join)('server/src/generated', rel);
+                    if ((0, sync_fs_1.copyFileIfChanged)(modulesIndexSrc, dest)) {
+                        stats.serverGeneratedIndex.push(dest);
                     }
+                    serverGeneratedKeep.add(rel);
                 }
-                // 1.2 逐 model 首次落地到 server/src/modules/{model}（跳过 form.validator，它归 web 阶段）
+                // 1.2 逐 model 分发。dto/entities → generated（覆盖，权威），其余 → modules（首次落地）
                 for (const modelName of stagingModels) {
                     const modelStaging = (0, path_1.join)(SERVER_STAGING, modelName);
                     const validatorInStaging = (0, path_1.join)('dto', `${modelName}.form.validator.ts`);
                     for (const rel of (0, sync_fs_1.listFilesRecursive)(modelStaging)) {
                         if (rel === validatorInStaging)
-                            continue;
-                        const dest = (0, path_1.join)('server/src/modules', modelName, rel);
-                        if (fs.existsSync(dest)) {
-                            stats.serverModulesSkipped.push(dest);
-                            continue;
+                            continue; // 归 web 阶段处理
+                        const isDto = rel.startsWith('dto' + path_1.sep) || rel.startsWith('dto/');
+                        const isEntity = rel.startsWith('entities' + path_1.sep) ||
+                            rel.startsWith('entities/');
+                        if (isDto || isEntity) {
+                            // 权威、每次覆盖到 server/src/generated/{model}/（controller 从这里 import）
+                            const relInGenerated = (0, path_1.join)(modelName, rel);
+                            const dest = (0, path_1.join)('server/src/generated', relInGenerated);
+                            if ((0, sync_fs_1.copyFileIfChanged)((0, path_1.join)(modelStaging, rel), dest)) {
+                                stats.serverGenerated.push(dest);
+                            }
+                            else {
+                                stats.serverGeneratedUnchanged.push(dest);
+                            }
+                            serverGeneratedKeep.add(relInGenerated);
+                        }
+                        else {
+                            // controller/service/module/spec —— 首次落地到 server/src/modules/{model}/
+                            const dest = (0, path_1.join)('server/src/modules', modelName, rel);
+                            if (fs.existsSync(dest)) {
+                                stats.serverModulesSkipped.push(dest);
+                                continue;
+                            }
+                            fs.mkdirSync((0, path_1.dirname)(dest), { recursive: true });
+                            fs.copyFileSync((0, path_1.join)(modelStaging, rel), dest);
+                            stats.serverModulesNew.push(dest);
                         }
-                        fs.mkdirSync((0, path_1.dirname)(dest), { recursive: true });
-                        fs.copyFileSync((0, path_1.join)(modelStaging, rel), dest);
-                        stats.serverModulesNew.push(dest);
                     }
                 }
+                // 1.3 孤儿清理：删除 server/src/generated 下所有本轮未产出的文件（例如被删除的 model）
+                stats.serverGeneratedOrphans = (0, sync_fs_1.pruneOrphans)('server/src/generated', serverGeneratedKeep).map((r) => (0, path_1.join)('server/src/generated', r));
             }
             // ============ 阶段 2：web 集中写入 ============
             const webKeep = new Set();
@@ -257,14 +285,18 @@ class PrismaAction extends abstract_action_1.AbstractAction {
         });
     }
     printReport(stats, verbose) {
-        const serverWritten = stats.serverModulesIndex.length + stats.serverModulesNew.length;
+        const serverWritten = stats.serverGeneratedIndex.length +
+            stats.serverGenerated.length +
+            stats.serverModulesNew.length;
         const webWritten = stats.generated.length + stats.routesNew.length;
         console.log('');
         console.log(chalk.bold('gadmin2 g prisma:'));
         console.log(`  ${chalk.cyan('server')}: ${serverWritten} written` +
-            ` (index=${stats.serverModulesIndex.length},` +
+            ` (index=${stats.serverGeneratedIndex.length},` +
+            ` generated=${stats.serverGenerated.length},` +
             ` modules-new=${stats.serverModulesNew.length}),` +
-            ` ${stats.serverModulesSkipped.length} skipped`);
+            ` ${stats.serverGeneratedUnchanged.length + stats.serverModulesSkipped.length} unchanged,` +
+            ` ${stats.serverGeneratedOrphans.length} orphan removed`);
         console.log(`  ${chalk.cyan('web')}: ${webWritten} written` +
             ` (routes-new=${stats.routesNew.length},` +
             ` generated=${stats.generated.length}),` +
@@ -281,7 +313,10 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             for (const p of list)
                 console.log('    ' + color(p));
         };
-        printGroup('server modules.index (diff-write)', stats.serverModulesIndex, chalk.green);
+        printGroup('server generated modules.index (diff-write)', stats.serverGeneratedIndex, chalk.green);
+        printGroup('server generated (written)', stats.serverGenerated, chalk.green);
+        printGroup('server generated (unchanged)', stats.serverGeneratedUnchanged, chalk.gray);
+        printGroup('server generated orphans removed', stats.serverGeneratedOrphans, chalk.red);
         printGroup('server modules (new)', stats.serverModulesNew, chalk.green);
         printGroup('server modules (skipped, exists)', stats.serverModulesSkipped, chalk.gray);
         printGroup('web routes (new)', stats.routesNew, chalk.green);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.159",
+  "version": "0.0.161",
   "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.128",
+    "@gadmin2n/schematics": "^0.0.129",
     "abc": "^0.6.1",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",