@gadmin2n/cli 0.0.196 → 0.0.198

package/actions/prisma.action.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrismaAction = void 0;
 const chalk = require("chalk");
+const child_process_1 = require("child_process");
 const fs = require("fs");
 const path_1 = require("path");
 const sync_fs_1 = require("../lib/utils/sync-fs");
@@ -84,7 +85,7 @@ class PrismaAction extends abstract_action_1.AbstractAction {
         return (0, sync_fs_1.writeFileIfChanged)('server/prisma/schema.prisma', generatorHead + merged);
     }
     handle(inputs, options) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             // 检查 prisma schema 配置是否存在
             const hasPrismaConfig = shell.test('-e', 'config/schema.prisma') ||
@@ -96,6 +97,12 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             }
             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);
+            // 非交互判定：stdin 非 TTY（CI/CD、管道、多数 AI agent 环境）时自动进入，
+            // 无需显式 --yes；--yes 用于强制（stdin 是 TTY 但无人值守的场景无法自动判断）。
+            // prisma migrate dev 的确认提示无自动确认参数可传，注入 CI=true 让 prisma 的
+            // canPrompt() 判定为非交互，遇确认直接报错退出（fail fast），而不是挂起等输入。
+            const yes = !!((_c = options.find((option) => option.name === 'yes')) === null || _c === void 0 ? void 0 : _c.value) ||
+                !process.stdin.isTTY;
             // 分发过程按类别记账，收尾统一打摘要 / --verbose 打完整清单
             const stats = {
                 serverGeneratedIndex: [],
@@ -114,8 +121,7 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             this.buildMergedSchema();
             // Staging 目录：generator 全量写入到 .gadmin/generated/*，CLI 再增量分发。
             // 不放在 src/ 下，避免任何 watcher 感知到中间态的进出。
-            // 用绝对路径以便 (a) 在 shell.cd('server/') 之后仍指向正确位置；
-            // (b) 通过 env 传给 generator 子进程时无歧义。
+            // 用绝对路径以便通过 env 传给 generator 子进程时无歧义。
             const cwd = process.cwd();
             const WEB_STAGING = (0, path_1.resolve)(cwd, '.gadmin/generated/web');
             const SERVER_STAGING = (0, path_1.resolve)(cwd, '.gadmin/generated/server');
@@ -129,14 +135,26 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             fs.mkdirSync(SERVER_STAGING, { recursive: true });
             // 执行代码生成（走 npm run 脚本）。通过 env 传 staging 路径，
             // generator 会优先使用 env 覆盖 .prisma schema 里的 output 配置。
+            // 用 spawnSync + stdio:'inherit' 而非 shelljs exec：后者经 exec-child.js
+            // 中转时 stdin 是 pipe，会导致 prisma migrate dev 判定为非交互式。
             const generateScript = devMode ? 'npm run generate:dev' : 'npm run generate';
-            const { code } = shell.cd('server/').exec(generateScript, {
-                env: Object.assign(Object.assign({}, process.env), { GADMIN_WEB_STAGING: WEB_STAGING, GADMIN_SERVER_STAGING: SERVER_STAGING, GADMIN_WEB_ROUTES_DIR: WEB_ROUTES_DIR }),
+            const result = (0, child_process_1.spawnSync)(generateScript, {
+                cwd: 'server',
+                shell: true,
+                stdio: 'inherit',
+                env: Object.assign(Object.assign(Object.assign({}, process.env), (yes ? { CI: 'true' } : {})), { GADMIN_WEB_STAGING: WEB_STAGING, GADMIN_SERVER_STAGING: SERVER_STAGING, GADMIN_WEB_ROUTES_DIR: WEB_ROUTES_DIR }),
             });
-            if (code !== 0) {
-                process.exit(code);
+            if (result.error) {
+                console.error(chalk.red(`Failed to run ${generateScript}: ${result.error.message}`));
+                process.exit(1);
+            }
+            if (result.status !== 0) {
+                if (yes) {
+                    console.log(chalk.yellow('Non-interactive mode: prisma migrate dev requires manual confirmation (e.g. data-loss warnings). ' +
+                        'Run `gadmin2 g prisma:dev` in an interactive terminal once to confirm the migration.'));
+                }
+                process.exit((_d = result.status) !== null && _d !== void 0 ? _d : 1);
             }
-            shell.cd('../');
             // 分发策略：先集中写 server/，再集中写 web/。
             // 目的是把 nest --watch 的 2 波重启合成 1 波，把 Vite 的 4 波 HMR 合成 1 波。
             //
@@ -280,7 +298,7 @@ class PrismaAction extends abstract_action_1.AbstractAction {
             this.printReport(stats, verbose);
             // 分发全部完成后，若 server/package.json 定义了 postgadminGenerate，
             // 触发它。项目侧可用来做 dev server 通知、缓存清理等自定义收尾。
-            this.runProjectPostHook();
+            this.runProjectPostHook(yes);
             process.exit(0);
         });
     }
@@ -325,7 +343,7 @@ class PrismaAction extends abstract_action_1.AbstractAction {
         printGroup('web generated (unchanged)', stats.generatedUnchanged, chalk.gray);
         printGroup('web orphans removed', stats.orphansRemoved, chalk.red);
     }
-    runProjectPostHook() {
+    runProjectPostHook(yes) {
         var _a;
         const pkgPath = 'server/package.json';
         let pkg;
@@ -338,14 +356,18 @@ class PrismaAction extends abstract_action_1.AbstractAction {
         if (!((_a = pkg === null || pkg === void 0 ? void 0 : pkg.scripts) === null || _a === void 0 ? void 0 : _a.postgadminGenerate))
             return;
         console.log(chalk.gray('Running postgadminGenerate hook ...'));
-        const { code } = shell
-            .cd('server/')
-            .exec('npm run --silent postgadminGenerate', {
-            env: Object.assign({}, process.env),
+        const result = (0, child_process_1.spawnSync)('npm run --silent postgadminGenerate', {
+            cwd: 'server',
+            shell: true,
+            stdio: 'inherit',
+            env: Object.assign(Object.assign({}, process.env), (yes ? { CI: 'true' } : {})),
         });
-        shell.cd('../');
-        if (code !== 0) {
-            console.log(chalk.yellow(`postgadminGenerate exited with code ${code}; ignoring (non-fatal).`));
+        if (result.error) {
+            console.log(chalk.yellow(`postgadminGenerate failed to spawn: ${result.error.message}; ignoring (non-fatal).`));
+            return;
+        }
+        if (result.status !== 0) {
+            console.log(chalk.yellow(`postgadminGenerate exited with code ${result.status}; ignoring (non-fatal).`));
         }
     }
 }

package/commands/generate.command.js

@@ -33,6 +33,8 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
         })
             .option('-c, --collection [collectionName]', 'Schematics collection to use.')
             .option('-v, --verbose', 'Print each affected src/ file (prisma).')
+            .option('-y, --yes', 'Force non-interactive mode: fail fast instead of hanging on prisma migrate dev confirmation prompts. ' +
+            'Auto-enabled when stdin is not a TTY (CI/CD, pipes, AI agents); use this flag for unattended TTY sessions.')
             .action((schematic, name, path, command) => __awaiter(this, void 0, void 0, function* () {
             const options = [];
             options.push({ name: 'dry-run', value: !!command.dryRun });
@@ -66,6 +68,7 @@ class GenerateCommand extends abstract_command_1.AbstractCommand {
                 },
             });
             options.push({ name: 'verbose', value: !!command.verbose });
+            options.push({ name: 'yes', value: !!command.yes });
             const inputs = [];
             inputs.push({ name: 'schematic', value: schematic });
             inputs.push({ name: 'name', value: name });

package/package.json

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