@lark-apaas/fullstack-cli 1.1.12-alpha.8 → 1.1.12-alpha.9

package/dist/index.js

@@ -141,22 +141,39 @@ 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");
-  console.log("[gen-db-schema] Using drizzle config from:", configPath);
-  if (!fs.existsSync(configPath)) {
+  const configPathCandidates = [
+    path.resolve(__dirname2, "config/drizzle.config.js"),
+    path.resolve(__dirname2, "../../config/drizzle.config.js"),
+    path.resolve(__dirname2, "../../../dist/config/drizzle.config.js")
+  ];
+  const configPath = configPathCandidates.find((p) => fs.existsSync(p));
+  console.log("[gen-db-schema] Using drizzle config from:", configPath ?? "(not found)");
+  if (!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);
+    const entryPath = require2.resolve("drizzle-kit");
+    let currentDir = path.dirname(entryPath);
+    let lastDir = null;
+    while (currentDir !== lastDir) {
+      const pkgJsonPath = path.join(currentDir, "package.json");
+      if (fs.existsSync(pkgJsonPath)) {
+        const pkgJsonRaw = fs.readFileSync(pkgJsonPath, "utf8");
+        const pkgJson = JSON.parse(pkgJsonRaw);
+        if (pkgJson.name === "drizzle-kit") {
+          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(currentDir, binRelPath);
+        }
+      }
+      lastDir = currentDir;
+      currentDir = path.dirname(currentDir);
+    }
+    throw new Error("Unable to locate drizzle-kit package root");
   };
   try {
     const env = {

package/package.json

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