cf-envsync 0.3.15 → 0.3.16

package/dist/index.js

@@ -13695,6 +13695,24 @@ function detectIndent(content) {
   const match = content.match(/\n(\s+)"/);
   return match ? match[1] : "  ";
 }
+function reindentJson(json, baseIndent) {
+  return json.replace(/\n/g, `
+${baseIndent}`);
+}
+function insertIntoObject(content, objEnd, key, value, keyIndent, braceIndent) {
+  const closingBrace = objEnd - 1;
+  let pos = closingBrace - 1;
+  while (pos >= 0 && (content[pos] === " " || content[pos] === "\t" || content[pos] === `
+` || content[pos] === "\r"))
+    pos--;
+  const needsComma = pos >= 0 && content[pos] !== "," && content[pos] !== "{";
+  const comma = needsComma ? "," : "";
+  pos++;
+  const insertion = `${comma}
+${keyIndent}"${key}": ${value}
+${braceIndent}`;
+  return content.slice(0, pos) + insertion + content.slice(closingBrace);
+}
 async function updateWranglerVars(appPath, environment, vars) {
   const configPath = findWranglerConfig(appPath);
   if (!configPath) {
@@ -13706,7 +13724,7 @@ async function updateWranglerVars(appPath, environment, vars) {
   const envSection = parsed?.env ?? {};
   const existingVars = envSection[environment]?.vars ?? {};
   const mergedVars = { ...existingVars, ...vars };
-  const varsJson = JSON.stringify(mergedVars, null, indent);
+  const varsJson = reindentJson(JSON.stringify(mergedVars, null, indent), indent.repeat(3));
   const envRange = findKeyRange(content, "env");
   if (envRange) {
     const envObjRange = findKeyRange(content, environment, envRange[0]);
@@ -13717,38 +13735,24 @@ async function updateWranglerVars(appPath, environment, vars) {
         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);
+      content = insertIntoObject(content, envObjRange[1], "vars", varsJson, indent.repeat(3), indent.repeat(2));
       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);
+${indent.repeat(2)}}`;
+    content = insertIntoObject(content, envRange[1], environment, inner2, indent.repeat(2), indent);
     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);
+  content = insertIntoObject(content, lastBrace + 1, "env", inner, indent, "");
   await writeFile(configPath, content);
   return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
 }

package/package.json

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