@gadmin2n/cli 0.0.195 → 0.0.197

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;
         return __awaiter(this, void 0, void 0, function* () {
             // 检查 prisma schema 配置是否存在
             const hasPrismaConfig = shell.test('-e', 'config/schema.prisma') ||
@@ -114,8 +115,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 +129,22 @@ 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, {
+            const result = (0, child_process_1.spawnSync)(generateScript, {
+                cwd: 'server',
+                shell: true,
+                stdio: 'inherit',
                 env: Object.assign(Object.assign({}, process.env), { 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) {
+                process.exit((_c = result.status) !== null && _c !== void 0 ? _c : 1);
             }
-            shell.cd('../');
             // 分发策略：先集中写 server/，再集中写 web/。
             // 目的是把 nest --watch 的 2 波重启合成 1 波，把 Vite 的 4 波 HMR 合成 1 波。
             //
@@ -338,14 +346,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', {
+        const result = (0, child_process_1.spawnSync)('npm run --silent postgadminGenerate', {
+            cwd: 'server',
+            shell: true,
+            stdio: 'inherit',
             env: Object.assign({}, process.env),
         });
-        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/package.json

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