@betterstart/cli 0.1.17 → 0.1.19

package/dist/cli.js

@@ -4672,7 +4672,12 @@ export const ${toCamelCase5(junctionName)} = pgTable(
 }
 function mergeImports(content, requiredImports, needsSql) {
   const pgCoreMatch = content.match(/import\s+\{([^}]+)\}\s+from\s+['"]drizzle-orm\/pg-core['"]/);
-  const hasSqlImport = content.includes("import { sql } from 'drizzle-orm'");
+  const drizzleOrmMatch = content.match(/import\s*\{([^}]*)\}\s*from\s*['"]drizzle-orm['"]/);
+  const existingDrizzleOrmImports = /* @__PURE__ */ new Set();
+  if (drizzleOrmMatch) {
+    drizzleOrmMatch[1].split(",").map((i) => i.trim()).filter(Boolean).forEach((i) => existingDrizzleOrmImports.add(i));
+  }
+  const hasSqlImport = existingDrizzleOrmImports.has("sql");
   const existing = /* @__PURE__ */ new Set();
   if (pgCoreMatch) {
     pgCoreMatch[1].split(",").map((i) => i.trim()).filter(Boolean).forEach((i) => {
@@ -4687,9 +4692,9 @@ function mergeImports(content, requiredImports, needsSql) {
   let updated = content;
   if (pgCoreMatch) {
     updated = updated.replace(/import\s+\{[^}]+\}\s+from\s+['"]drizzle-orm\/pg-core['"]/, newImport);
-  } else if (hasSqlImport) {
+  } else if (drizzleOrmMatch) {
     updated = updated.replace(
-      /import\s+\{[^}]+\}\s+from\s+['"]drizzle-orm['"]/,
+      /import\s*\{[^}]*\}\s*from\s*['"]drizzle-orm['"]/,
       (match) => `${match}
 ${newImport}`
     );
@@ -4698,8 +4703,17 @@ ${newImport}`
 ${updated}`;
   }
   if (needsSql && !hasSqlImport) {
-    updated = `import { sql } from 'drizzle-orm'
+    if (drizzleOrmMatch) {
+      existingDrizzleOrmImports.add("sql");
+      const sortedOrm = Array.from(existingDrizzleOrmImports).sort();
+      updated = updated.replace(
+        /import\s*\{[^}]*\}\s*from\s*['"]drizzle-orm['"]/,
+        `import { ${sortedOrm.join(", ")} } from 'drizzle-orm'`
+      );
+    } else {
+      updated = `import { sql } from 'drizzle-orm'
 ${updated}`;
+    }
   }
   return updated;
 }
@@ -7707,8 +7721,9 @@ function runPostGenerate(cwd, schemaName, options = {}) {
       console.log(ok ? "  Database schema synced" : "  Database push failed (run db:push manually)");
     } else {
       console.log("\n  Running drizzle-kit push...");
+      const drizzleBin = path21.join(cwd, "node_modules", ".bin", "drizzle-kit");
       try {
-        execFileSync2("npx", ["drizzle-kit", "push"], { cwd, stdio: "pipe" });
+        execFileSync2(drizzleBin, ["push", "--force"], { cwd, stdio: "pipe" });
         result.dbPush = "success";
         console.log("  Database schema synced");
       } catch {
@@ -7725,8 +7740,9 @@ function runPostGenerate(cwd, schemaName, options = {}) {
     result.lintFix = ok ? "success" : "failed";
     console.log(ok ? "  Code formatted" : "  Lint fix had issues (run lint:fix manually)");
   } else {
+    const biomeBin = path21.join(cwd, "node_modules", ".bin", "biome");
     try {
-      execFileSync2("npx", ["biome", "check", "--write", "."], { cwd, stdio: "pipe" });
+      execFileSync2(biomeBin, ["check", "--write", "."], { cwd, stdio: "pipe" });
       result.lintFix = "success";
       console.log("  Code formatted with Biome");
     } catch {
@@ -11432,10 +11448,25 @@ export default db
 
 // src/init/templates/db/drizzle-config.ts
 function drizzleConfigTemplate() {
-  return `import { loadEnvConfig } from '@next/env'
+  return `import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 import { defineConfig } from 'drizzle-kit'
 
-loadEnvConfig(process.cwd())
+// Load .env.local (avoids @next/env dependency for drizzle-kit)
+for (const envFile of ['.env.local', '.env']) {
+  try {
+    const content = readFileSync(resolve(process.cwd(), envFile), 'utf-8')
+    for (const line of content.split('\\n')) {
+      const trimmed = line.trim()
+      if (!trimmed || trimmed.startsWith('#')) continue
+      const eqIdx = trimmed.indexOf('=')
+      if (eqIdx === -1) continue
+      const key = trimmed.slice(0, eqIdx).trim()
+      const val = trimmed.slice(eqIdx + 1).trim().replace(/^['"]|['"]$/g, '')
+      if (!process.env[key]) process.env[key] = val
+    }
+  } catch {}
+}
 
 export default defineConfig({
   out: './cms/db/migrations',