cf-envsync 0.3.14 → 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,41 +13735,141 @@ 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 };
 }
+function findFullKeyRange(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)) {
+      const keyStart = 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 [keyStart, end];
+      }
+    }
+    if (text[i2] === '"') {
+      inString = true;
+      i2++;
+      continue;
+    }
+    i2++;
+  }
+  return;
+}
+function removeJsoncKey(text, key, searchStart, searchEnd) {
+  const range = findFullKeyRange(text, key, searchStart);
+  if (!range || range[0] >= searchEnd)
+    return;
+  const [keyStart, valueEnd] = range;
+  let removeStart = keyStart;
+  let removeEnd = valueEnd;
+  let b2 = keyStart - 1;
+  while (b2 >= 0 && (text[b2] === " " || text[b2] === "\t" || text[b2] === `
+` || text[b2] === "\r"))
+    b2--;
+  if (b2 >= 0 && text[b2] === ",") {
+    removeStart = b2;
+  } else {
+    let a2 = valueEnd;
+    while (a2 < text.length && (text[a2] === " " || text[a2] === "\t" || text[a2] === `
+` || text[a2] === "\r"))
+      a2++;
+    if (a2 < text.length && text[a2] === ",") {
+      removeEnd = a2 + 1;
+    }
+    let lineStart = keyStart - 1;
+    while (lineStart >= 0 && (text[lineStart] === " " || text[lineStart] === "\t"))
+      lineStart--;
+    if (lineStart >= 0 && text[lineStart] === `
+`) {
+      removeStart = lineStart;
+    }
+  }
+  return text.slice(0, removeStart) + text.slice(removeEnd);
+}
+async function removeWranglerVars(appPath, environments, dryRun = false) {
+  const configPath = findWranglerConfig(appPath);
+  if (!configPath) {
+    return { success: true, removedCount: 0 };
+  }
+  let content = await readFile(configPath);
+  const parsed = JSON.parse(stripJsonc(content));
+  const envSection = parsed?.env ?? {};
+  let removedCount = 0;
+  for (const environment of environments) {
+    if (!envSection[environment]?.vars)
+      continue;
+    removedCount++;
+    if (dryRun)
+      continue;
+    const envRange = findKeyRange(content, "env");
+    if (!envRange)
+      continue;
+    const envObjRange = findKeyRange(content, environment, envRange[0]);
+    if (!envObjRange)
+      continue;
+    const result = removeJsoncKey(content, "vars", envObjRange[0], envObjRange[1]);
+    if (result !== undefined) {
+      content = result;
+    }
+  }
+  if (!dryRun && removedCount > 0) {
+    await writeFile(configPath, content);
+  }
+  return { success: true, filePath: configPath, removedCount };
+}
 var init_wrangler = __esm(() => {
   init_dist2();
   init_process();
@@ -15256,6 +15374,89 @@ var init_encrypt = __esm(() => {
   });
 });
 
+// src/commands/clean.ts
+var exports_clean = {};
+__export(exports_clean, {
+  default: () => clean_default
+});
+import { join as join9, relative as relative4 } from "node:path";
+import { unlinkSync } from "node:fs";
+var clean_default;
+var init_clean = __esm(() => {
+  init_dist();
+  init_dist2();
+  init_config();
+  init_wrangler();
+  init_fs();
+  clean_default = defineCommand({
+    meta: {
+      name: "clean",
+      description: "Remove generated files (.dev.vars, wrangler.jsonc vars)"
+    },
+    args: {
+      "dry-run": {
+        type: "boolean",
+        description: "Show what would be removed without removing",
+        default: false
+      }
+    },
+    async run({ args }) {
+      const rawConfig = await loadConfig();
+      const errors = validateConfig(rawConfig);
+      if (errors.length > 0) {
+        for (const err of errors)
+          consola.error(err);
+        process.exit(1);
+      }
+      const config = resolveConfig(rawConfig);
+      const apps = Object.values(config.apps);
+      if (apps.length === 0) {
+        consola.warn("No apps to process.");
+        return;
+      }
+      const dryRun = args["dry-run"];
+      let removedFiles = 0;
+      let removedVars = 0;
+      for (const app of apps) {
+        for (const devFileName of app.devFiles) {
+          const filePath = join9(app.absolutePath, devFileName);
+          if (!fileExists(filePath))
+            continue;
+          const rel = relative4(config.projectRoot, filePath);
+          if (dryRun) {
+            consola.log(`  Would remove ${rel}`);
+          } else {
+            unlinkSync(filePath);
+            consola.log(`  Removed ${rel}`);
+          }
+          removedFiles++;
+        }
+        const result = await removeWranglerVars(app.absolutePath, config.environments, dryRun);
+        if (result.success && result.removedCount > 0) {
+          const rel = relative4(config.projectRoot, result.filePath);
+          if (dryRun) {
+            consola.log(`  Would remove ${result.removedCount} vars section(s) from ${rel}`);
+          } else {
+            consola.log(`  Removed ${result.removedCount} vars section(s) from ${rel}`);
+          }
+          removedVars += result.removedCount;
+        }
+      }
+      if (removedFiles === 0 && removedVars === 0) {
+        consola.info("Nothing to clean.");
+        return;
+      }
+      const action = dryRun ? "Would remove" : "Removed";
+      const parts = [];
+      if (removedFiles > 0)
+        parts.push(`${removedFiles} file(s)`);
+      if (removedVars > 0)
+        parts.push(`${removedVars} vars section(s)`);
+      consola.success(`${action} ${parts.join(", ")}.`);
+    }
+  });
+});
+
 // src/index.ts
 init_dist();
 var main = defineCommand({
@@ -15274,7 +15475,8 @@ var main = defineCommand({
     normalize: () => Promise.resolve().then(() => (init_normalize(), exports_normalize)).then((m2) => m2.default),
     merge: () => Promise.resolve().then(() => (init_merge(), exports_merge)).then((m2) => m2.default),
     list: () => Promise.resolve().then(() => (init_list(), exports_list)).then((m2) => m2.default),
-    encrypt: () => Promise.resolve().then(() => (init_encrypt(), exports_encrypt)).then((m2) => m2.default)
+    encrypt: () => Promise.resolve().then(() => (init_encrypt(), exports_encrypt)).then((m2) => m2.default),
+    clean: () => Promise.resolve().then(() => (init_clean(), exports_clean)).then((m2) => m2.default)
   }
 });
 runMain(main);

package/package.json

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