drizzle-auto 1.1.28 → 1.1.30

package/index.js

@@ -1,16 +1,11 @@
 #!/usr/bin/env node
 
 /**
-
-🍵 Drizzle-Auto v2.1 - Fail-Fast Edition
-
-🔹 Strictly catches WebSocket/Neon ENOTFOUND errors
-
-🔹 Stops immediately on any failure
-
-🔹 Debounced watcher to prevent race conditions
-*/
-
+ * 🍵 Drizzle-Auto v2.2 - Strict Validation Edition
+ * 🔹 Checks Config -> Checks Schema -> Runs Drizzle
+ * 🔹 Strictly catches WebSocket/Neon ENOTFOUND errors
+ * 🔹 Stops immediately on any failure
+ */
 
 const { spawn } = require("child_process");
 const path = require("path");
@@ -21,84 +16,83 @@ try { require("ts-node").register({ transpileOnly: true }); } catch (e) {}
 
 // ---------------------- COLORS & UI ----------------------
 const T = {
-reset: "\x1b[0m",
-bold: "\x1b[1m",
-cyan: "\x1b[38;5;51m",
-lime: "\x1b[38;5;118m",
-yellow: "\x1b[38;5;226m",
-red: "\x1b[38;5;196m",
-gray: "\x1b[38;5;244m",
+  reset: "\x1b[0m", bold: "\x1b[1m", cyan: "\x1b[38;5;51m",
+  lime: "\x1b[38;5;118m", yellow: "\x1b[38;5;226m", red: "\x1b[38;5;196m", gray: "\x1b[38;5;244m",
 };
 
 const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 let spinIdx = 0, spinInterval;
 
 function startLoading(msg) {
-stopLoading();
-spinInterval = setInterval(() => {
-process.stdout.write(\r${T.cyan}${frames[spinIdx++ % frames.length]}${T.reset} ${T.bold}${msg}${T.reset} );
-}, 80);
+  stopLoading();
+  spinInterval = setInterval(() => {
+    process.stdout.write(`\r${T.cyan}${frames[spinIdx++ % frames.length]}${T.reset} ${T.bold}${msg}${T.reset} `);
+  }, 80);
 }
 
 function stopLoading() {
-if (spinInterval) {
-clearInterval(spinInterval);
-spinInterval = null;
-process.stdout.write("\r\x1b[K");
-}
+  if (spinInterval) { clearInterval(spinInterval); spinInterval = null; }
+  process.stdout.write("\r\x1b[K");
 }
 
-// ---------------------- UTILS ----------------------
-const PKG_PATH = path.join(process.cwd(), "package.json");
-function injectScript() {
-if (!fs.existsSync(PKG_PATH)) return;
-try {
-const pkg = JSON.parse(fs.readFileSync(PKG_PATH, "utf8"));
-pkg.scripts ||= {};
-if (!pkg.scripts.tea) {
-pkg.scripts.tea = "drizzle-auto";
-fs.writeFileSync(PKG_PATH, JSON.stringify(pkg, null, 2));
-console.log(${T.lime}🍵 Script added → npm run tea${T.reset});
-}
-} catch (e) {}
-}
-
-// ---------------------- COMMAND RUNNER (STRICT) ----------------------
-function runCommand(cmd, label) {
-return new Promise((resolve, reject) => {
-startLoading(label);
-
-// We pipe stderr to catch hidden WebSocket/Neon errors that don't trigger exit codes  
-const child = spawn(cmd, { shell: true, stdio: ["inherit", "inherit", "pipe"] });  
-let errorOutput = "";  
+// ---------------------- VALIDATION LOGIC ----------------------
+function validateProject() {
+  const root = process.cwd();
+  const configFiles = ["drizzle.config.ts", "drizzle.config.js", "drizzle.config.mjs", "drizzle.config.cjs"];
+  const configPath = configFiles.map(f => path.join(root, f)).find(f => fs.existsSync(f));
 
-child.stderr.on("data", (data) => {  
-  const str = data.toString();  
-  errorOutput += str;  
-  process.stderr.write(str); // Still show the error to the user  
-});  
+  if (!configPath) {
+    return { ok: false, msg: "drizzle.config.[ts|js] not found in root." };
+  }
 
-child.on("close", (code) => {  
-  stopLoading();  
+  try {
+    // Basic regex check for schema path to avoid complex module loading issues
+    const configContent = fs.readFileSync(configPath, "utf8");
+    const schemaMatch = configContent.match(/schema:\s*["'](.+?)["']/);
     
-  // Strict failure check:   
-  // 1. Non-zero exit code  
-  // 2. Presence of "ErrorEvent" or "ENOTFOUND" in stderr (Neon driver specific)  
-  const hasDriverError = /ErrorEvent|ENOTFOUND|failed to connect/i.test(errorOutput);  
-
-  if (code !== 0 || hasDriverError) {  
-    reject(new Error(`${label} failed execution.`));  
-  } else {  
-    resolve();  
-  }  
-});  
-
-child.on("error", (err) => {  
-  stopLoading();  
-  reject(err);  
-});
+    if (!schemaMatch) {
+      return { ok: false, msg: `Could not find 'schema' path inside ${path.basename(configPath)}` };
+    }
+
+    const schemaPath = path.resolve(root, schemaMatch[1]);
+    if (!fs.existsSync(schemaPath)) {
+      return { ok: false, msg: `Schema file defined in config does not exist: ${schemaMatch[1]}` };
+    }
+
+    return { ok: true, config: configPath, schema: schemaPath };
+  } catch (e) {
+    return { ok: false, msg: `Error reading config: ${e.message}` };
+  }
+}
 
-});
+// ---------------------- COMMAND RUNNER (STRICT) ----------------------
+function runCommand(cmd, label) {
+  return new Promise((resolve, reject) => {
+    startLoading(label);
+    const child = spawn(cmd, { shell: true, stdio: ["inherit", "inherit", "pipe"] });
+    let errorOutput = "";
+
+    child.stderr.on("data", (data) => {
+      const str = data.toString();
+      errorOutput += str;
+      process.stderr.write(str); 
+    });
+
+    child.on("close", (code) => {
+      stopLoading();
+      const hasDriverError = /ErrorEvent|ENOTFOUND|failed to connect|syscall: 'getaddrinfo'/i.test(errorOutput);
+      if (code !== 0 || hasDriverError) {
+        reject(new Error(`${label} failed.`));
+      } else {
+        resolve();
+      }
+    });
+
+    child.on("error", (err) => {
+      stopLoading();
+      reject(err);
+    });
+  });
 }
 
 // ---------------------- ENGINE ----------------------
@@ -106,80 +100,73 @@ let isRunning = false;
 let isBroken = false;
 
 async function triggerEngine() {
-if (isRunning) return;
-isRunning = true;
-
-try {
-const steps = [
-{ name: "Integrity Check", cmd: "npx drizzle-kit check" },
-{ name: "Generate Migration", cmd: "npx drizzle-kit generate" },
-{ name: "Push Database", cmd: "npx drizzle-kit push" }
-];
-
-for (const step of steps) {  
-  await runCommand(step.cmd, step.name);  
-}  
-
-console.log(`\n${T.lime}${T.bold}🎉 SUCCESS: Database synced.${T.reset}\n`);  
-isBroken = false;
-
-} catch (err) {
-isBroken = true;
-console.log(\n${T.red}${T.bold}🚨 CRITICAL STOP:${T.reset} ${err.message});
-console.log(${T.yellow}Execution paused. Fix the error and save any file to retry.${T.reset}\n);
-
-if (process.argv.includes('--postinstall')) {  
-  process.exit(1);  
-}
-
-} finally {
-isRunning = false;
-}
+  if (isRunning) return;
+  isRunning = true;
+
+  // 1. Check Config and Schema first
+  const check = validateProject();
+  if (!check.ok) {
+    console.log(`\n${T.red}${T.bold}📁 CONFIG ERROR:${T.reset} ${check.msg}`);
+    isBroken = true;
+    isRunning = false;
+    if (process.argv.includes('--postinstall')) process.exit(1);
+    return;
+  }
+
+  try {
+    const steps = [
+      { name: "Integrity Check", cmd: "npx drizzle-kit check" },
+      { name: "Generate Migration", cmd: "npx drizzle-kit generate" },
+      { name: "Push Database", cmd: "npx drizzle-kit push" }
+    ];
+
+    for (const step of steps) {
+      await runCommand(step.cmd, step.name);
+    }
+
+    console.log(`\n${T.lime}${T.bold}🎉 SUCCESS: Database synced.${T.reset}\n`);
+    isBroken = false;
+  } catch (err) {
+    isBroken = true;
+    console.log(`\n${T.red}${T.bold}🚨 CRITICAL STOP:${T.reset} ${err.message}`);
+    console.log(`${T.yellow}Execution paused. Fix the code/connection and save to retry.${T.reset}\n`);
+    if (process.argv.includes('--postinstall')) process.exit(1);
+  } finally {
+    isRunning = false;
+  }
 }
 
 // ---------------------- MAIN / WATCHER ----------------------
-injectScript();
-
 const skipWatcher = process.argv.includes('--postinstall');
 
 if (skipWatcher) {
-triggerEngine();
+  triggerEngine();
 } else {
-triggerEngine();
-
-try {
-const chokidar = require("chokidar");
-let debounceTimer;
-
-const watcher = chokidar.watch(".", {  
-  ignored: [/node_modules/, /\.git/, /\.next/, /dist/, /out/],  
-  ignoreInitial: true,  
-  usePolling: true,  
-  interval: 300  
-});  
-
-watcher.on("all", (event, path) => {  
-  clearTimeout(debounceTimer);  
-  debounceTimer = setTimeout(() => {  
-    if (isBroken) console.log(`${T.cyan}🔄 Change detected in ${path}. Retrying...${T.reset}`);  
-    triggerEngine();  
-  }, 500);  
-});  
-
-console.log(`${T.gray}👀 Watching for schema changes...${T.reset}`);
-
-} catch (e) {
-console.log(${T.yellow}⚠ Chokidar not found. Watch mode disabled.${T.reset});
-}
+  triggerEngine();
+  try {
+    const chokidar = require("chokidar");
+    let debounceTimer;
+    const watcher = chokidar.watch(".", {
+      ignored: [/node_modules/, /\.git/, /\.next/, /dist/],
+      ignoreInitial: true,
+      usePolling: true,
+      interval: 300
+    });
+
+    watcher.on("all", (event, path) => {
+      clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(() => {
+        if (isBroken) console.log(`${T.cyan}🔄 Fix detected in ${path}. Retrying...${T.reset}`);
+        triggerEngine();
+      }, 500);
+    });
+    console.log(`${T.gray}👀 Watching for schema changes...${T.reset}`);
+  } catch (e) {
+    console.log(`${T.yellow}⚠ Chokidar not found. Watch mode disabled.${T.reset}`);
+  }
 }
 
-// ---------------------- GLOBAL ERROR CATCH ----------------------
-process.on("uncaughtException", (err) => {
-console.log(\n${T.red}${T.bold}🛡️ UNCAUGHT ERROR:${T.reset} ${err.message});
-process.exit(1);
-});
-
 process.on("SIGINT", () => {
-console.log(\n${T.yellow}Shutting down Drizzle-Auto...${T.reset});
-process.exit(0);
-});
+  console.log(`\n${T.yellow}Shutting down...${T.reset}`);
+  process.exit(0);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-auto",
-  "version": "1.1.28",
+  "version": "1.1.30",
   "description": "",
   "license": "ISC",
   "author": "pavel ahmmed hridoy",