@lark-apaas/fullstack-cli 0.1.0-alpha.7 → 0.1.0-alpha.9

package/bin/{cli.js → cli.mjs}

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 
-const path = require('path');
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const require = createRequire(import.meta.url);
 
 const command = process.argv[2];
 const distPath = path.join(__dirname, '..', 'dist');
@@ -9,13 +15,14 @@ async function main() {
   try {
     switch (command) {
       case 'gen-db-schema': {
-        const { run } = await import(path.join(distPath, 'commands', 'gen-db-schema.js'));
+        const modulePath = path.join(distPath, 'commands', 'gen-db-schema.js');
+        const { run } = await import(modulePath);
         await run();
         break;
       }
       case 'sync':
       case 'postinstall': {
-        // 调用原有的 sync-scripts.js
+        // 调用原有的 sync-scripts.js (CommonJS)
         require('./sync-scripts.js');
         break;
       }
@@ -40,6 +47,7 @@ async function main() {
     }
   } catch (error) {
     console.error(`Failed to execute command "${command}":`, error.message);
+    console.error(error.stack);
     process.exit(1);
   }
 }

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

@@ -2,8 +2,11 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { spawnSync } from 'node:child_process';
+import { createRequire } from 'node:module';
 // 加载 .env 配置
 import { config as loadEnv } from 'dotenv';
+// 创建 require 函数来加载 CommonJS 模块
+const require = createRequire(import.meta.url);
 /**
  * 生成数据库 schema
  *
@@ -67,9 +70,9 @@ export async function run() {
     fs.mkdirSync(path.dirname(SCHEMA_FILE), { recursive: true });
     fs.copyFileSync(generatedSchema, SCHEMA_FILE);
     console.log(`[gen-db-schema] ✓ Copied to ${outputPath}`);
-    // 后处理（如果 devtool-kits 可用）
+    // 后处理 schema（使用 CommonJS require 方式加载）
     try {
-        const { postprocessDrizzleSchema } = await import('@lark-apaas/devtool-kits');
+        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);
@@ -77,7 +80,7 @@ export async function run() {
         console.log('[gen-db-schema] ✓ Postprocessed schema');
     }
     catch (error) {
-        console.warn('[gen-db-schema] Postprocess skipped (devtool-kits not available)');
+        console.warn('[gen-db-schema] Postprocess failed:', error instanceof Error ? error.message : String(error));
     }
     // 清理临时文件
     if (fs.existsSync(OUT_DIR)) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.9",
   "description": "CLI tool for fullstack template management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "bin": "./bin/cli.js",
+  "bin": "./bin/cli.mjs",
   "files": [
     "dist",
     "templates",

package/templates/drizzle.config.ts

@@ -4,15 +4,14 @@ import { defineConfig } from 'drizzle-kit';
 // 通过环境变量传递具体参数
 const outputDir = process.env.__DRIZZLE_OUT_DIR__ || './server/database/.introspect';
 const schemaPath = process.env.__DRIZZLE_SCHEMA_PATH__ || './server/database/schema.ts';
-const schemaFilter = process.env.DRIZZLE_SCHEMA_FILTER?.split(',') || [];
-const tablesFilter = process.env.DRIZZLE_TABLES_FILTER?.split(',') || ['*'];
 
 const parsedUrl = new URL(process.env.SUDA_DATABASE_URL || '');
+const schemaFilter = parsedUrl.searchParams.get('schema')?.split(',') ?? [];
 
-export default defineConfig({
+const config = {
   schema: schemaPath,
   out: outputDir,
-  tablesFilter,
+  tablesFilter: ['*'],
   schemaFilter,
   dialect: 'postgresql',
   dbCredentials: {
@@ -22,4 +21,5 @@ export default defineConfig({
     password: decodeURIComponent(parsedUrl.password),
     database: parsedUrl.pathname.split('/')[1],
   },
-});
+}
+export default defineConfig(config);