cf-envsync 0.3.11 → 0.3.13

package/dist/index.js

@@ -13527,6 +13527,119 @@ function stripJsonc(text) {
   }
   return result.replace(/,(\s*[}\]])/g, "$1");
 }
+function findValueEnd(text, start) {
+  const open = text[start];
+  const close = open === "{" ? "}" : open === "[" ? "]" : undefined;
+  if (!close) {
+    let i3 = start;
+    if (text[i3] === '"') {
+      i3++;
+      while (i3 < text.length) {
+        if (text[i3] === "\\" && i3 + 1 < text.length) {
+          i3 += 2;
+          continue;
+        }
+        if (text[i3] === '"')
+          return i3 + 1;
+        i3++;
+      }
+      return i3;
+    }
+    while (i3 < text.length && text[i3] !== "," && text[i3] !== "}" && text[i3] !== "]")
+      i3++;
+    return i3;
+  }
+  let depth = 1;
+  let i2 = start + 1;
+  let inStr = false;
+  while (i2 < text.length && depth > 0) {
+    if (inStr) {
+      if (text[i2] === "\\" && i2 + 1 < text.length) {
+        i2 += 2;
+        continue;
+      }
+      if (text[i2] === '"')
+        inStr = false;
+      i2++;
+      continue;
+    }
+    if (text[i2] === '"') {
+      inStr = true;
+      i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "/") {
+      while (i2 < text.length && text[i2] !== `
+`)
+        i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "*") {
+      i2 += 2;
+      while (i2 < text.length && !(text[i2] === "*" && text[i2 + 1] === "/"))
+        i2++;
+      i2 += 2;
+      continue;
+    }
+    if (text[i2] === open)
+      depth++;
+    if (text[i2] === close)
+      depth--;
+    i2++;
+  }
+  return i2;
+}
+function findKeyRange(text, key, searchStart = 0) {
+  const needle = `"${key}"`;
+  let i2 = searchStart;
+  let inString = false;
+  while (i2 < text.length) {
+    if (inString) {
+      if (text[i2] === "\\" && i2 + 1 < text.length) {
+        i2 += 2;
+        continue;
+      }
+      if (text[i2] === '"')
+        inString = false;
+      i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "/") {
+      while (i2 < text.length && text[i2] !== `
+`)
+        i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "*") {
+      i2 += 2;
+      while (i2 < text.length && !(text[i2] === "*" && text[i2 + 1] === "/"))
+        i2++;
+      i2 += 2;
+      continue;
+    }
+    if (text.startsWith(needle, i2)) {
+      let j = i2 + needle.length;
+      while (j < text.length && (text[j] === " " || text[j] === "\t" || text[j] === `
+` || text[j] === "\r"))
+        j++;
+      if (text[j] === ":") {
+        j++;
+        while (j < text.length && (text[j] === " " || text[j] === "\t" || text[j] === `
+` || text[j] === "\r"))
+          j++;
+        const end = findValueEnd(text, j);
+        return [j, end];
+      }
+    }
+    if (text[i2] === '"') {
+      inString = true;
+      i2++;
+      continue;
+    }
+    i2++;
+  }
+  return;
+}
 async function checkWrangler() {
   const result = await exec(["npx", "wrangler", "--version"]);
   return result.success;
@@ -13581,25 +13694,65 @@ function findWranglerConfig(appPath) {
   }
   return;
 }
+function detectIndent(content) {
+  const match = content.match(/\n(\s+)"/);
+  return match ? match[1] : "  ";
+}
 async function updateWranglerVars(appPath, environment, vars) {
   const configPath = findWranglerConfig(appPath);
   if (!configPath) {
     return { success: false, updatedCount: 0 };
   }
-  const content = await readFile(configPath);
-  const stripped = stripJsonc(content);
-  const config = JSON.parse(stripped);
-  if (!config.env || typeof config.env !== "object") {
-    config.env = {};
-  }
-  const envSection = config.env;
-  if (!envSection[environment] || typeof envSection[environment] !== "object") {
-    envSection[environment] = {};
-  }
-  const existingVars = envSection[environment].vars || {};
-  envSection[environment].vars = { ...existingVars, ...vars };
-  await writeFile(configPath, JSON.stringify(config, null, 2) + `
-`);
+  let content = await readFile(configPath);
+  const indent = detectIndent(content);
+  const parsed = JSON.parse(stripJsonc(content));
+  const envSection = parsed?.env ?? {};
+  const existingVars = envSection[environment]?.vars ?? {};
+  const mergedVars = { ...existingVars, ...vars };
+  const varsJson = JSON.stringify(mergedVars, null, indent);
+  const envRange = findKeyRange(content, "env");
+  if (envRange) {
+    const envObjRange = findKeyRange(content, environment, envRange[0]);
+    if (envObjRange) {
+      const varsRange = findKeyRange(content, "vars", envObjRange[0]);
+      if (varsRange) {
+        content = content.slice(0, varsRange[0]) + varsJson + content.slice(varsRange[1]);
+        await writeFile(configPath, content);
+        return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
+      }
+      const insertAt2 = envObjRange[1] - 1;
+      const envIndent3 = indent.repeat(3);
+      const insertion3 = `,
+${envIndent3}"vars": ${varsJson}
+${indent.repeat(2)}`;
+      content = content.slice(0, insertAt2) + insertion3 + content.slice(insertAt2);
+      await writeFile(configPath, content);
+      return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
+    }
+    const insertAt = envRange[1] - 1;
+    const envIndent2 = indent.repeat(2);
+    const inner2 = `{
+${indent.repeat(3)}"vars": ${varsJson}
+${envIndent2}}`;
+    const insertion2 = `,
+${envIndent2}"${environment}": ${inner2}
+${indent}`;
+    content = content.slice(0, insertAt) + insertion2 + content.slice(insertAt);
+    await writeFile(configPath, content);
+    return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
+  }
+  const lastBrace = content.lastIndexOf("}");
+  const envIndent = indent;
+  const inner = `{
+${indent.repeat(2)}"${environment}": ` + `{
+${indent.repeat(3)}"vars": ${varsJson}
+${indent.repeat(2)}}
+${indent}}`;
+  const insertion = `,
+${envIndent}"env": ${inner}
+`;
+  content = content.slice(0, lastBrace) + insertion + content.slice(lastBrace);
+  await writeFile(configPath, content);
   return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
 }
 var init_wrangler = __esm(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cf-envsync",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Sync .env files to Cloudflare Workers secrets, .dev.vars, and more",
   "type": "module",
   "exports": {