@lark-apaas/fullstack-cli 0.1.0-alpha.4 → 0.1.0-alpha.6

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

@@ -1,6 +1,9 @@
 import path from 'node:path';
 import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import { spawnSync } from 'node:child_process';
+// 加载 .env 配置
+import { config as loadEnv } from 'dotenv';
 /**
  * 生成数据库 schema
  *
@@ -11,9 +14,16 @@ import { spawnSync } from 'node:child_process';
  * - DRIZZLE_TABLES_FILTER: 表过滤器，逗号分隔，默认 '*'
  */
 export async function run() {
+    // 加载用户项目的 .env 文件
+    const envPath = path.resolve(process.cwd(), '.env');
+    if (fs.existsSync(envPath)) {
+        loadEnv({ path: envPath });
+        console.log('[gen-db-schema] ✓ Loaded .env file');
+    }
     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);
     }
     const outputPath = process.env.DB_SCHEMA_OUTPUT || 'server/database/schema.ts';
@@ -21,6 +31,9 @@ export async function run() {
     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);
     // 使用 CLI 内部的 drizzle 配置
     const cliRoot = path.resolve(__dirname, '../..');
     const configPath = path.join(cliRoot, 'templates', 'drizzle.config.ts');

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.6",
   "description": "CLI tool for fullstack template management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "bin": {
-    "fullstack-cli": "./bin/cli.js"
-  },
+  "bin": "./bin/cli.js",
   "files": [
     "dist",
     "templates",
@@ -31,11 +29,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@lark-apaas/devtool-kits": "^1.0.0"
+    "@lark-apaas/devtool-kits": "^1.0.0",
+    "dotenv": "^16.0.0"
   },
   "peerDependencies": {
-    "@nestjs/core": "^10.0.0",
-    "@lark-apaas/fullstack-nestjs-core": "^1.0.0",
     "drizzle-kit": "^0.20.0"
   },
   "peerDependenciesMeta": {

package/templates/scripts/gen-db-schema.ts

@@ -1,48 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawnSync } from 'node:child_process';
-import { postprocessDrizzleSchema } from '@lark-apaas/devtool-kits';
-
-const OUT_DIR = path.resolve(process.cwd(), 'server/database/.introspect');
-const SCHEMA_FILE = path.resolve(process.cwd(), 'server/database/schema.ts');
-
-function run(): void {
-  const args = process.argv.slice(2);
-  const spawnArgs = ['--yes', 'drizzle-kit', 'introspect', '--config', 'drizzle.config.ts', ...args];
-
-  const result = spawnSync('npx', spawnArgs, { stdio: 'inherit' });
-  if (result.error) {
-    console.error('[gen-db-schema] Execution failed:', result.error);
-    process.exit(result.status ?? 1);
-  }
-
-  if ((result.status ?? 0) !== 0) {
-    process.exit(result.status ?? 1);
-  }
-
-  const generatedSchema = path.join(OUT_DIR, 'schema.ts');
-  if (!fs.existsSync(generatedSchema)) {
-    console.warn('[gen-db-schema] schema.ts not generated');
-    process.exit(1);
-  }
-
-  fs.mkdirSync(path.dirname(SCHEMA_FILE), { recursive: true });
-  fs.copyFileSync(generatedSchema, SCHEMA_FILE);
-
-  try {
-    const stats = postprocessDrizzleSchema(SCHEMA_FILE);
-    if (stats?.unmatchedUnknown?.length) {
-      console.warn('[gen-db-schema] Unmatched custom types detected');
-    }
-  } catch (error) {
-    console.warn('[gen-db-schema] postprocess failed:', error);
-  }
-
-  if (fs.existsSync(OUT_DIR)) {
-    fs.rmSync(OUT_DIR, { recursive: true, force: true });
-  }
-}
-
-if (require.main === module) {
-  run();
-}