@betterstart/cli 0.1.17 → 0.1.18

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;
 }