@lark-apaas/fullstack-cli 1.1.12-alpha.2 → 1.1.12-alpha.4

package/dist/index.js

@@ -120,6 +120,7 @@ import path2 from "path";
 import fs2 from "fs";
 import { fileURLToPath } from "url";
 import { spawnSync } from "child_process";
+import { createRequire } from "module";
 import { config as loadEnv } from "dotenv";
 
 // src/internal/postprocess-drizzle-schema.ts
@@ -1263,6 +1264,33 @@ async function parseAndGenerateNestResourceTemplate(options) {
 }
 
 // src/commands/db/schema.handler.ts
+var require2 = createRequire(import.meta.url);
+function findPackageRoot(startDir) {
+  let current = startDir;
+  let parent = path2.dirname(current);
+  while (parent !== current) {
+    if (fs2.existsSync(path2.join(current, "package.json"))) {
+      return current;
+    }
+    current = parent;
+    parent = path2.dirname(current);
+  }
+  if (fs2.existsSync(path2.join(current, "package.json"))) {
+    return current;
+  }
+  return startDir;
+}
+function resolveDrizzleKitBin() {
+  const candidates = ["drizzle-kit/bin.cjs", "drizzle-kit/bin.js", "drizzle-kit/bin"];
+  for (const id of candidates) {
+    try {
+      return require2.resolve(id);
+    } catch {
+      continue;
+    }
+  }
+  return require2.resolve("drizzle-kit");
+}
 async function run(options = {}) {
   let exitCode = 0;
   const envPath2 = path2.resolve(process.cwd(), ".env");
@@ -1278,6 +1306,7 @@ async function run(options = {}) {
   const outputPath = options.output || process.env.DB_SCHEMA_OUTPUT || "server/database/schema.ts";
   const OUT_DIR = path2.resolve(process.cwd(), "server/database/.introspect");
   const SCHEMA_FILE = path2.resolve(process.cwd(), outputPath);
+  const GENERATED_SCHEMA_FILE = path2.join(OUT_DIR, "schema.ts");
   console.log("[gen-db-schema] Starting...");
   const __filename = fileURLToPath(import.meta.url);
   const __dirname2 = path2.dirname(__filename);
@@ -1290,11 +1319,13 @@ async function run(options = {}) {
     const env = {
       ...process.env,
       __DRIZZLE_OUT_DIR__: OUT_DIR,
-      __DRIZZLE_SCHEMA_PATH__: SCHEMA_FILE
+      __DRIZZLE_SCHEMA_PATH__: GENERATED_SCHEMA_FILE
     };
     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 cliRootDir = findPackageRoot(__dirname2);
+    const spawnArgs = [drizzleKitBin, "introspect", "--config", configPath, ...args];
+    const result = spawnSync(process.execPath, spawnArgs, { stdio: "inherit", env, cwd: cliRootDir });
     if (result.error) {
       console.error("[gen-db-schema] Execution failed:", result.error);
       throw result.error;
@@ -1302,7 +1333,7 @@ async function run(options = {}) {
     if ((result.status ?? 0) !== 0) {
       throw new Error(`drizzle-kit introspect failed with status ${result.status}`);
     }
-    const generatedSchema = path2.join(OUT_DIR, "schema.ts");
+    const generatedSchema = GENERATED_SCHEMA_FILE;
     if (!fs2.existsSync(generatedSchema)) {
       console.error("[gen-db-schema] schema.ts not generated");
       throw new Error("drizzle-kit introspect failed to generate schema.ts");

package/package.json

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