@lark-apaas/fullstack-cli 1.1.0 → 1.1.1-alpha.0

package/dist/commands/gen-db-schema.js

@@ -23,6 +23,7 @@ const require = createRequire(import.meta.url);
  */
 export async function run(options = {}) {
     // 加载用户项目的 .env 文件
+    let exitCode = 0;
     const envPath = path.resolve(process.cwd(), '.env');
     if (fs.existsSync(envPath)) {
         loadEnv({ path: envPath });
@@ -31,7 +32,6 @@ export async function run(options = {}) {
     const databaseUrl = process.env.SUDA_DATABASE_URL;
     if (!databaseUrl) {
         console.error('[gen-db-schema] Error: SUDA_DATABASE_URL environment variable is required');
-        console.error('[gen-db-schema] Please set it in .env file or pass it as environment variable');
         process.exit(1);
     }
     // 命令行选项优先于环境变量
@@ -39,7 +39,6 @@ export async function run(options = {}) {
     const OUT_DIR = path.resolve(process.cwd(), 'server/database/.introspect');
     const SCHEMA_FILE = path.resolve(process.cwd(), outputPath);
     console.log('[gen-db-schema] Starting...');
-    console.log(`[gen-db-schema] Output: ${outputPath}`);
     // 获取当前文件所在目录（ESM 方式）
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
@@ -63,32 +62,27 @@ export async function run(options = {}) {
         const result = spawnSync('npx', spawnArgs, { stdio: 'inherit', env });
         if (result.error) {
             console.error('[gen-db-schema] Execution failed:', result.error);
-            process.exit(result.status ?? 1);
+            throw result.error;
         }
         if ((result.status ?? 0) !== 0) {
-            process.exit(result.status ?? 1);
+            throw new Error(`drizzle-kit introspect failed with status ${result.status}`);
         }
         // 复制生成的 schema
         const generatedSchema = path.join(OUT_DIR, 'schema.ts');
         if (!fs.existsSync(generatedSchema)) {
             console.error('[gen-db-schema] schema.ts not generated');
-            process.exit(1);
+            throw new Error('drizzle-kit introspect failed to generate schema.ts');
         }
         fs.mkdirSync(path.dirname(SCHEMA_FILE), { recursive: true });
         fs.copyFileSync(generatedSchema, SCHEMA_FILE);
         console.log(`[gen-db-schema] ✓ Copied to ${outputPath}`);
         // 后处理 schema（使用 CommonJS require 方式加载）
-        try {
-            const { postprocessDrizzleSchema } = require('@lark-apaas/devtool-kits');
-            const stats = postprocessDrizzleSchema(SCHEMA_FILE);
-            if (stats?.unmatchedUnknown?.length) {
-                console.warn('[gen-db-schema] Unmatched custom types detected:', stats.unmatchedUnknown);
-            }
-            console.log('[gen-db-schema] ✓ Postprocessed schema');
-        }
-        catch (error) {
-            console.warn('[gen-db-schema] Postprocess failed:', error instanceof Error ? error.message : String(error));
+        const { postprocessDrizzleSchema } = require('@lark-apaas/devtool-kits');
+        const stats = postprocessDrizzleSchema(SCHEMA_FILE);
+        if (stats?.unmatchedUnknown?.length) {
+            console.warn('[gen-db-schema] Unmatched custom types detected:', stats.unmatchedUnknown);
         }
+        console.log('[gen-db-schema] ✓ Postprocessed schema');
         try {
             if (options.enableNestModuleGenerate) {
                 const { parseAndGenerateNestResourceTemplate } = require('@lark-apaas/devtool-kits');
@@ -107,10 +101,15 @@ export async function run(options = {}) {
         }
         console.log('[gen-db-schema] ✓ Complete');
     }
+    catch (err) {
+        console.error('[gen-db-schema] Failed:', err instanceof Error ? err.message : String(err));
+        exitCode = 1;
+    }
     finally {
         // 清理临时文件
         if (fs.existsSync(OUT_DIR)) {
             fs.rmSync(OUT_DIR, { recursive: true, force: true });
         }
+        process.exit(exitCode);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.0",
+  "version": "1.1.1-alpha.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@lark-apaas/devtool-kits": "^1.2.0",
+    "@lark-apaas/devtool-kits": "^1.2.2",
     "@vercel/nft": "^0.30.3",
     "cac": "^6.7.14",
     "dotenv": "^16.0.0",