@lark-apaas/fullstack-cli 1.1.12-alpha.6 → 1.1.12-alpha.7

package/dist/config/drizzle.config.js

@@ -3,12 +3,16 @@ import { defineConfig } from "drizzle-kit";
 var outputDir = process.env.__DRIZZLE_OUT_DIR__ || "./server/database/.introspect";
 var schemaPath = process.env.__DRIZZLE_SCHEMA_PATH__ || "./server/database/schema.ts";
 var parsedUrl = new URL(process.env.SUDA_DATABASE_URL || "");
-var schemaFilter = parsedUrl.searchParams.get("schema")?.split(",") ?? [];
+var envSchemaFilter = process.env.DRIZZLE_SCHEMA_FILTER;
+var urlSchemaFilter = parsedUrl.searchParams.get("schema");
+var schemaFilter = (envSchemaFilter ?? urlSchemaFilter ?? "").split(",").map((s) => s.trim()).filter(Boolean);
 parsedUrl.searchParams.delete("schema");
+var envTablesFilter = process.env.DRIZZLE_TABLES_FILTER;
+var tablesFilter = (envTablesFilter ?? "*").split(",").map((s) => s.trim()).filter(Boolean);
 var config = {
   schema: schemaPath,
   out: outputDir,
-  tablesFilter: ["*"],
+  tablesFilter,
   schemaFilter,
   dialect: "postgresql",
   dbCredentials: {

package/dist/index.js

@@ -110,8 +110,8 @@ Command "${ctx.commandName}" completed in ${elapsed}ms`);
     return this;
   }
   /** 运行 CLI */
-  async run(argv = process.argv) {
-    await this.program.parseAsync(argv);
+  run(argv = process.argv) {
+    this.program.parse(argv);
   }
 };
 
@@ -141,20 +141,33 @@ async function run(options = {}) {
   console.log("[gen-db-schema] Starting...");
   const __filename = fileURLToPath(import.meta.url);
   const __dirname2 = path.dirname(__filename);
-  const configPath = path.join(__dirname2, "config", "drizzle.config.js");
+  const configPath = path.resolve(__dirname2, "../../config/drizzle.config.js");
   if (!fs.existsSync(configPath)) {
     console.error("[gen-db-schema] Error: drizzle config not found in CLI package");
     process.exit(1);
   }
+  const resolveDrizzleKitBin = () => {
+    const pkgJsonPath = require2.resolve("drizzle-kit/package.json");
+    const pkgJsonRaw = fs.readFileSync(pkgJsonPath, "utf8");
+    const pkgJson = JSON.parse(pkgJsonRaw);
+    const binField = pkgJson.bin;
+    const binRelPath = typeof binField === "string" ? binField : binField?.["drizzle-kit"];
+    if (!binRelPath) {
+      throw new Error("Unable to resolve drizzle-kit binary from package.json");
+    }
+    return path.resolve(path.dirname(pkgJsonPath), binRelPath);
+  };
   try {
     const env = {
       ...process.env,
       __DRIZZLE_OUT_DIR__: OUT_DIR,
-      __DRIZZLE_SCHEMA_PATH__: SCHEMA_FILE
+      __DRIZZLE_SCHEMA_PATH__: SCHEMA_FILE,
+      DRIZZLE_SCHEMA_FILTER: options.schemaFilter ?? process.env.DRIZZLE_SCHEMA_FILTER,
+      DRIZZLE_TABLES_FILTER: options.tablesFilter ?? process.env.DRIZZLE_TABLES_FILTER
     };
-    const args = process.argv.slice(3).filter((arg) => !arg.startsWith("--enable-nest-module-generate"));
-    const spawnArgs = ["--yes", "drizzle-kit", "introspect", "--config", configPath, ...args];
-    const result = spawnSync("npx", spawnArgs, { stdio: "inherit", env });
+    const drizzleKitBin = resolveDrizzleKitBin();
+    const spawnArgs = [drizzleKitBin, "introspect", "--config", configPath];
+    const result = spawnSync(process.execPath, spawnArgs, { stdio: "inherit", env, cwd: process.cwd() });
     if (result.error) {
       console.error("[gen-db-schema] Execution failed:", result.error);
       throw result.error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.12-alpha.6",
+  "version": "1.1.12-alpha.7",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",