@suronai/cli 0.1.43 → 0.1.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suronai/cli",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "description": "Suron CLI — secrets delivery",
   "type": "module",
   "bin": {

package/src/commands.js

@@ -104,7 +104,18 @@ function installSdk(cwd) {
 
 // ── Entry-point patching ──────────────────────────────────────────────────────
 
-async function patchEntryPoint(cwd, isEsm) {
+/**
+ * Detect whether a file should be treated as ESM by inspecting its content,
+ * regardless of what package.json says. A file is ESM if it contains top-level
+ * import/export statements or top-level await outside of an async function.
+ */
+function detectFileIsEsm(src) {
+  if (/^(import|export)\s/m.test(src)) return true;
+  if (/^\s*await\s/m.test(src)) return true;
+  return false;
+}
+
+async function patchEntryPoint(cwd, isEsmFromPkg) {
   // Check package.json "main" first, then fall back to common names
   let mainFromPkg = null;
   try {
@@ -112,9 +123,7 @@ async function patchEntryPoint(cwd, isEsm) {
     if (pkg.main) mainFromPkg = pkg.main;
   } catch {}
 
-  const candidates = isEsm
-    ? ["index.js", "index.mjs", "src/index.js", "src/index.mjs"]
-    : ["index.js", "index.cjs", "src/index.js", "src/index.cjs"];
+  const candidates = ["index.js", "index.mjs", "index.cjs", "src/index.js", "src/index.mjs", "src/index.cjs"];
 
   if (mainFromPkg && !candidates.includes(mainFromPkg)) {
     candidates.unshift(mainFromPkg);
@@ -126,11 +135,15 @@ async function patchEntryPoint(cwd, isEsm) {
     if (existsSync(abs)) { entryPath = abs; break; }
   }
 
-  if (!entryPath) { printSnippet(isEsm); return; }
+  if (!entryPath) { printSnippet(isEsmFromPkg); return; }
 
   let src;
   try { src = readFileSync(entryPath, "utf-8"); } catch { return; }
 
+  // Prefer content-based detection — a file with ESM syntax IS ESM regardless
+  // of what package.json declares, and must be patched accordingly.
+  const isEsm = detectFileIsEsm(src) || isEsmFromPkg;
+
   const lines = src.split("\n");
   const toReplace   = [];
   const seenIndices = new Set();
@@ -142,30 +155,24 @@ async function patchEntryPoint(cwd, isEsm) {
     if (lines[i].includes("dotenv")) {
       seenIndices.add(i);
       let replacement = null;
+
       if (isEsm) {
+        // ESM: replace any dotenv import with @suronai/sdk import + await config()
         if (trimmed.startsWith("import")) {
-          replacement = indent + trimmed.replace(/(from\s+)['"]dotenv(?:\/config)?['"]/, '$1"@suronai/sdk"');
+          replacement = indent + `import { config } from "@suronai/sdk";\n` + indent + `await config();`;
         }
       } else {
+        // CJS: replace dotenv require — wrap in IIFE so top-level await is never emitted
         if (trimmed.includes("require")) {
-          // Handle: require("dotenv").config()  →  require("@suronai/sdk").config()
-          // Handle: require("dotenv/config")    →  require("@suronai/sdk").config()
-          // Handle: const x = require("dotenv") →  const { config } = require("@suronai/sdk")\nawait config()
-          if (/require\(['"]dotenv['"]\)\.config/.test(trimmed)) {
-            replacement = indent + trimmed.replace(/require\(['"]dotenv['"]\)/, 'require("@suronai/sdk")');
-            // wrap the whole statement to be async-aware
-            replacement = indent + `await require("@suronai/sdk").config();`;
-          } else if (/require\(['"]dotenv\/config['"]\)/.test(trimmed)) {
-            replacement = indent + `await require("@suronai/sdk").config();`;
-          } else {
-            replacement = indent + `const { config: suronConfig } = require("@suronai/sdk");\n` + indent + `await suronConfig();`;
-          }
+          replacement = indent + `const { config: _suronConfig } = require("@suronai/sdk");\n`
+                      + indent + `await (async () => { await _suronConfig(); })();`;
         }
       }
       toReplace.push({ index: i, content: lines[i], replacement });
     }
   }
 
+  // ESM only: if there's a standalone `config()` call left over after an import swap
   if (isEsm) {
     for (let i = 0; i < lines.length; i++) {
       if (seenIndices.has(i)) continue;
@@ -213,6 +220,7 @@ async function patchEntryPoint(cwd, isEsm) {
     return (r && r.replacement !== null) ? r.replacement : line;
   });
 
+  // For ESM: ensure the `await config()` call sits right after the last import
   if (isEsm) {
     const callLineIndex   = outLines.findIndex(l => /^\s*await config\s*\(/.test(l));
     const lastImportIndex = outLines.reduce((last, l, i) => l.trimStart().startsWith("import ") ? i : last, -1);