@gadmin2n/cli 0.0.158 → 0.0.160

package/actions/prisma.action.d.ts

@@ -3,5 +3,6 @@ import { AbstractAction } from './abstract.action';
 export declare class PrismaAction extends AbstractAction {
     private buildMergedSchema;
     handle(inputs: Input[], options: Input[]): Promise<void>;
+    private printReport;
     private runProjectPostHook;
 }

package/actions/prisma.action.js

@@ -51,39 +51,40 @@ 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;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // 检查 prisma schema 配置是否存在
             const hasPrismaConfig = shell.test('-e', 'config/schema.prisma') ||
@@ -94,6 +95,18 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                 process.exit(-1);
             }
             const devMode = !!((_a = options.find((option) => option.name === 'dev')) === null || _a === void 0 ? void 0 : _a.value);
+            const verbose = !!((_b = options.find((option) => option.name === 'verbose')) === null || _b === void 0 ? void 0 : _b.value);
+            // 分发过程按类别记账，收尾统一打摘要 / --verbose 打完整清单
+            const stats = {
+                serverModulesIndex: [],
+                serverModulesNew: [],
+                serverModulesSkipped: [],
+                routesNew: [],
+                routesSkipped: [],
+                generated: [],
+                generatedUnchanged: [],
+                orphansRemoved: [], // web/src/generated/** 孤儿清理
+            };
             // 构建合并的 schema（两种模式都需要重建 schema.prisma）
             this.buildMergedSchema();
             // Staging 目录：generator 全量写入到 node_modules/.cache/*，CLI 再增量分发。
@@ -145,7 +158,10 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                 // 1.1 modules.index.ts —— 顶层入口
                 const modulesIndexSrc = (0, path_1.join)(SERVER_STAGING, 'modules.index.ts');
                 if (fs.existsSync(modulesIndexSrc)) {
-                    (0, sync_fs_1.copyFileIfChanged)(modulesIndexSrc, 'server/src/generated/modules.index.ts');
+                    const rel = 'server/src/generated/modules.index.ts';
+                    if ((0, sync_fs_1.copyFileIfChanged)(modulesIndexSrc, rel)) {
+                        stats.serverModulesIndex.push(rel);
+                    }
                 }
                 // 1.2 逐 model 首次落地到 server/src/modules/{model}（跳过 form.validator，它归 web 阶段）
                 for (const modelName of stagingModels) {
@@ -155,10 +171,13 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                         if (rel === validatorInStaging)
                             continue;
                         const dest = (0, path_1.join)('server/src/modules', modelName, rel);
-                        if (fs.existsSync(dest))
+                        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);
                     }
                 }
             }
@@ -174,10 +193,20 @@ class PrismaAction extends abstract_action_1.AbstractAction {
                         if (!fs.existsSync(destRoutes)) {
                             fs.mkdirSync((0, path_1.dirname)(destRoutes), { recursive: true });
                             fs.copyFileSync(src, destRoutes);
+                            stats.routesNew.push(destRoutes);
+                        }
+                        else {
+                            stats.routesSkipped.push(destRoutes);
                         }
                     }
                     else {
-                        (0, sync_fs_1.copyFileIfChanged)(src, (0, path_1.join)('web/src/generated', rel));
+                        const dest = (0, path_1.join)('web/src/generated', rel);
+                        if ((0, sync_fs_1.copyFileIfChanged)(src, dest)) {
+                            stats.generated.push(dest);
+                        }
+                        else {
+                            stats.generatedUnchanged.push(dest);
+                        }
                         webKeep.add(rel);
                     }
                 }
@@ -185,7 +214,13 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             // 2.2 form.validator.ts（server generator 产出，需搬到 web/src/generated/props/{model}/）
             for (const modelName of stagingModels) {
                 const validatorRel = `props/${modelName}/form.validator.ts`;
-                (0, sync_fs_1.copyFileIfChanged)((0, path_1.join)(SERVER_STAGING, modelName, 'dto', `${modelName}.form.validator.ts`), (0, path_1.join)('web/src/generated', validatorRel));
+                const dest = (0, path_1.join)('web/src/generated', validatorRel);
+                if ((0, sync_fs_1.copyFileIfChanged)((0, path_1.join)(SERVER_STAGING, modelName, 'dto', `${modelName}.form.validator.ts`), dest)) {
+                    stats.generated.push(dest);
+                }
+                else {
+                    stats.generatedUnchanged.push(dest);
+                }
                 webKeep.add(validatorRel);
             }
             // 2.3 Prisma / config 类型
@@ -195,19 +230,67 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             let prismaContent = fs.readFileSync(prismaSrc, 'utf8');
             prismaContent = prismaContent.replace("import * as runtime from '@prisma/client/runtime/index';", 'declare const runtime : any');
             prismaContent = prismaContent.replace(/bigint/g, 'number');
-            (0, sync_fs_1.writeFileIfChanged)((0, path_1.join)('web/src/generated', prismaRel), prismaContent);
+            const prismaDest = (0, path_1.join)('web/src/generated', prismaRel);
+            if ((0, sync_fs_1.writeFileIfChanged)(prismaDest, prismaContent)) {
+                stats.generated.push(prismaDest);
+            }
+            else {
+                stats.generatedUnchanged.push(prismaDest);
+            }
             webKeep.add(prismaRel);
             const configRel = 'types/config.types.d.ts';
-            (0, sync_fs_1.copyFileIfChanged)('config/.types.d.ts', (0, path_1.join)('web/src/generated', configRel));
+            const configDest = (0, path_1.join)('web/src/generated', configRel);
+            if ((0, sync_fs_1.copyFileIfChanged)('config/.types.d.ts', configDest)) {
+                stats.generated.push(configDest);
+            }
+            else {
+                stats.generatedUnchanged.push(configDest);
+            }
             webKeep.add(configRel);
             // 2.4 孤儿清理：删除 web/src/generated 下所有本轮未产出的文件（例如被删除的 model）
-            (0, sync_fs_1.pruneOrphans)('web/src/generated', webKeep);
+            stats.orphansRemoved = (0, sync_fs_1.pruneOrphans)('web/src/generated', webKeep).map((r) => (0, path_1.join)('web/src/generated', r));
+            // 打印摘要 / 完整清单
+            this.printReport(stats, verbose);
             // 分发全部完成后，若 server/package.json 定义了 postgadminGenerate，
             // 触发它。项目侧可用来做 dev server 通知、缓存清理等自定义收尾。
             this.runProjectPostHook();
             process.exit(0);
         });
     }
+    printReport(stats, verbose) {
+        const serverWritten = stats.serverModulesIndex.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},` +
+            ` modules-new=${stats.serverModulesNew.length}),` +
+            ` ${stats.serverModulesSkipped.length} skipped`);
+        console.log(`  ${chalk.cyan('web')}: ${webWritten} written` +
+            ` (routes-new=${stats.routesNew.length},` +
+            ` generated=${stats.generated.length}),` +
+            ` ${stats.routesSkipped.length + stats.generatedUnchanged.length} unchanged,` +
+            ` ${stats.orphansRemoved.length} orphan removed`);
+        if (!verbose) {
+            console.log(chalk.gray('  (use -v / --verbose to list files)'));
+            return;
+        }
+        const printGroup = (title, list, color) => {
+            if (list.length === 0)
+                return;
+            console.log(chalk.bold(`\n  ${title} (${list.length}):`));
+            for (const p of list)
+                console.log('    ' + color(p));
+        };
+        printGroup('server modules.index (diff-write)', stats.serverModulesIndex, chalk.green);
+        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);
+        printGroup('web routes (skipped, exists)', stats.routesSkipped, chalk.gray);
+        printGroup('web generated (written)', stats.generated, chalk.green);
+        printGroup('web generated (unchanged)', stats.generatedUnchanged, chalk.gray);
+        printGroup('web orphans removed', stats.orphansRemoved, chalk.red);
+    }
     runProjectPostHook() {
         var _a;
         const pkgPath = 'server/package.json';

package/commands/generate.command.js

@@ -32,6 +32,7 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
             return { value: false, passedAsInput: true };
         })
             .option('-c, --collection [collectionName]', 'Schematics collection to use.')
+            .option('-v, --verbose', 'Print each affected src/ file (prisma).')
             .action((schematic, name, path, command) => __awaiter(this, void 0, void 0, function* () {
             const options = [];
             options.push({ name: 'dry-run', value: !!command.dryRun });
@@ -64,6 +65,7 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
                     keepInputNameFormat: true,
                 },
             });
+            options.push({ name: 'verbose', value: !!command.verbose });
             const inputs = [];
             inputs.push({ name: 'schematic', value: schematic });
             inputs.push({ name: 'name', value: name });

package/lib/schematics/gadmin.collection.js

@@ -34,6 +34,10 @@ class GadminCollection extends abstract_collection_1.AbstractCollection {
                 const opts = [];
                 if (name.includes(':dev'))
                     opts.push({ name: 'dev', value: true });
+                const verbose = options.find((o) => o.name === 'verbose');
+                if (verbose && verbose.value) {
+                    opts.push({ name: 'verbose', value: true });
+                }
                 return yield prisma.handle([], opts);
             }
             const schematic = this.validate(name);

package/lib/utils/sync-fs.d.ts

@@ -37,5 +37,6 @@ export declare function syncDir(srcDir: string, destDir: string): {
 /**
  * 删除 destDir 下所有不在 keepFiles 里的文件（以及随之空掉的父目录）。
  * 用于「本轮 model 目录被删」的孤儿清理场景。
+ * @returns 被删除的文件相对路径列表（相对 destDir）
  */
-export declare function pruneOrphans(destDir: string, keepFiles: Set<string>): number;
+export declare function pruneOrphans(destDir: string, keepFiles: Set<string>): string[];

package/lib/utils/sync-fs.js

@@ -115,15 +115,16 @@ exports.syncDir = syncDir;
 /**
  * 删除 destDir 下所有不在 keepFiles 里的文件（以及随之空掉的父目录）。
  * 用于「本轮 model 目录被删」的孤儿清理场景。
+ * @returns 被删除的文件相对路径列表（相对 destDir）
  */
 function pruneOrphans(destDir, keepFiles) {
-    let deleted = 0;
+    const removed = [];
     for (const rel of listFilesRecursive(destDir)) {
         if (!keepFiles.has(rel)) {
             removeFileAndPruneEmptyDirs(path.join(destDir, rel), destDir);
-            deleted++;
+            removed.push(rel);
         }
     }
-    return deleted;
+    return removed;
 }
 exports.pruneOrphans = pruneOrphans;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.158",
+  "version": "0.0.160",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"