cf-envsync 0.3.10 → 0.3.12

package/dist/index.js

@@ -12491,7 +12491,7 @@ var require_ignore = __commonJS((exports, module) => {
     TMP_KEY_IGNORE = Symbol.for("node-ignore");
   }
   var KEY_IGNORE = TMP_KEY_IGNORE;
-  var define = (object, key, value) => Object.defineProperty(object, key, { value });
+  var define2 = (object, key, value) => Object.defineProperty(object, key, { value });
   var REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g;
   var RETURN_FALSE = () => false;
   var sanitizeRange = (range) => range.replace(REGEX_REGEXP_RANGE, (match, from, to) => from.charCodeAt(0) <= to.charCodeAt(0) ? match : EMPTY);
@@ -12634,7 +12634,7 @@ var require_ignore = __commonJS((exports, module) => {
       ignoreCase = ignorecase,
       allowRelativePaths = false
     } = {}) {
-      define(this, KEY_IGNORE, true);
+      define2(this, KEY_IGNORE, true);
       this._rules = [];
       this._ignoreCase = ignoreCase;
       this._allowRelativePaths = allowRelativePaths;
@@ -13440,6 +13440,152 @@ Done!`);
   });
 });
 
+// node_modules/jsonc-parser/lib/umd/main.js
+var require_main3 = __commonJS((exports, module) => {
+  (function(factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+      var v2 = factory(__require, exports);
+      if (v2 !== undefined)
+        module.exports = v2;
+    } else if (typeof define === "function" && define.amd) {
+      define(["require", "exports", "./impl/format", "./impl/edit", "./impl/scanner", "./impl/parser"], factory);
+    }
+  })(function(require2, exports2) {
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.applyEdits = exports2.modify = exports2.format = exports2.printParseErrorCode = exports2.ParseErrorCode = exports2.stripComments = exports2.visit = exports2.getNodeValue = exports2.getNodePath = exports2.findNodeAtOffset = exports2.findNodeAtLocation = exports2.parseTree = exports2.parse = exports2.getLocation = exports2.SyntaxKind = exports2.ScanError = exports2.createScanner = undefined;
+    const formatter = require2("./impl/format");
+    const edit = require2("./impl/edit");
+    const scanner = require2("./impl/scanner");
+    const parser = require2("./impl/parser");
+    exports2.createScanner = scanner.createScanner;
+    var ScanError;
+    (function(ScanError2) {
+      ScanError2[ScanError2["None"] = 0] = "None";
+      ScanError2[ScanError2["UnexpectedEndOfComment"] = 1] = "UnexpectedEndOfComment";
+      ScanError2[ScanError2["UnexpectedEndOfString"] = 2] = "UnexpectedEndOfString";
+      ScanError2[ScanError2["UnexpectedEndOfNumber"] = 3] = "UnexpectedEndOfNumber";
+      ScanError2[ScanError2["InvalidUnicode"] = 4] = "InvalidUnicode";
+      ScanError2[ScanError2["InvalidEscapeCharacter"] = 5] = "InvalidEscapeCharacter";
+      ScanError2[ScanError2["InvalidCharacter"] = 6] = "InvalidCharacter";
+    })(ScanError || (exports2.ScanError = ScanError = {}));
+    var SyntaxKind;
+    (function(SyntaxKind2) {
+      SyntaxKind2[SyntaxKind2["OpenBraceToken"] = 1] = "OpenBraceToken";
+      SyntaxKind2[SyntaxKind2["CloseBraceToken"] = 2] = "CloseBraceToken";
+      SyntaxKind2[SyntaxKind2["OpenBracketToken"] = 3] = "OpenBracketToken";
+      SyntaxKind2[SyntaxKind2["CloseBracketToken"] = 4] = "CloseBracketToken";
+      SyntaxKind2[SyntaxKind2["CommaToken"] = 5] = "CommaToken";
+      SyntaxKind2[SyntaxKind2["ColonToken"] = 6] = "ColonToken";
+      SyntaxKind2[SyntaxKind2["NullKeyword"] = 7] = "NullKeyword";
+      SyntaxKind2[SyntaxKind2["TrueKeyword"] = 8] = "TrueKeyword";
+      SyntaxKind2[SyntaxKind2["FalseKeyword"] = 9] = "FalseKeyword";
+      SyntaxKind2[SyntaxKind2["StringLiteral"] = 10] = "StringLiteral";
+      SyntaxKind2[SyntaxKind2["NumericLiteral"] = 11] = "NumericLiteral";
+      SyntaxKind2[SyntaxKind2["LineCommentTrivia"] = 12] = "LineCommentTrivia";
+      SyntaxKind2[SyntaxKind2["BlockCommentTrivia"] = 13] = "BlockCommentTrivia";
+      SyntaxKind2[SyntaxKind2["LineBreakTrivia"] = 14] = "LineBreakTrivia";
+      SyntaxKind2[SyntaxKind2["Trivia"] = 15] = "Trivia";
+      SyntaxKind2[SyntaxKind2["Unknown"] = 16] = "Unknown";
+      SyntaxKind2[SyntaxKind2["EOF"] = 17] = "EOF";
+    })(SyntaxKind || (exports2.SyntaxKind = SyntaxKind = {}));
+    exports2.getLocation = parser.getLocation;
+    exports2.parse = parser.parse;
+    exports2.parseTree = parser.parseTree;
+    exports2.findNodeAtLocation = parser.findNodeAtLocation;
+    exports2.findNodeAtOffset = parser.findNodeAtOffset;
+    exports2.getNodePath = parser.getNodePath;
+    exports2.getNodeValue = parser.getNodeValue;
+    exports2.visit = parser.visit;
+    exports2.stripComments = parser.stripComments;
+    var ParseErrorCode;
+    (function(ParseErrorCode2) {
+      ParseErrorCode2[ParseErrorCode2["InvalidSymbol"] = 1] = "InvalidSymbol";
+      ParseErrorCode2[ParseErrorCode2["InvalidNumberFormat"] = 2] = "InvalidNumberFormat";
+      ParseErrorCode2[ParseErrorCode2["PropertyNameExpected"] = 3] = "PropertyNameExpected";
+      ParseErrorCode2[ParseErrorCode2["ValueExpected"] = 4] = "ValueExpected";
+      ParseErrorCode2[ParseErrorCode2["ColonExpected"] = 5] = "ColonExpected";
+      ParseErrorCode2[ParseErrorCode2["CommaExpected"] = 6] = "CommaExpected";
+      ParseErrorCode2[ParseErrorCode2["CloseBraceExpected"] = 7] = "CloseBraceExpected";
+      ParseErrorCode2[ParseErrorCode2["CloseBracketExpected"] = 8] = "CloseBracketExpected";
+      ParseErrorCode2[ParseErrorCode2["EndOfFileExpected"] = 9] = "EndOfFileExpected";
+      ParseErrorCode2[ParseErrorCode2["InvalidCommentToken"] = 10] = "InvalidCommentToken";
+      ParseErrorCode2[ParseErrorCode2["UnexpectedEndOfComment"] = 11] = "UnexpectedEndOfComment";
+      ParseErrorCode2[ParseErrorCode2["UnexpectedEndOfString"] = 12] = "UnexpectedEndOfString";
+      ParseErrorCode2[ParseErrorCode2["UnexpectedEndOfNumber"] = 13] = "UnexpectedEndOfNumber";
+      ParseErrorCode2[ParseErrorCode2["InvalidUnicode"] = 14] = "InvalidUnicode";
+      ParseErrorCode2[ParseErrorCode2["InvalidEscapeCharacter"] = 15] = "InvalidEscapeCharacter";
+      ParseErrorCode2[ParseErrorCode2["InvalidCharacter"] = 16] = "InvalidCharacter";
+    })(ParseErrorCode || (exports2.ParseErrorCode = ParseErrorCode = {}));
+    function printParseErrorCode(code) {
+      switch (code) {
+        case 1:
+          return "InvalidSymbol";
+        case 2:
+          return "InvalidNumberFormat";
+        case 3:
+          return "PropertyNameExpected";
+        case 4:
+          return "ValueExpected";
+        case 5:
+          return "ColonExpected";
+        case 6:
+          return "CommaExpected";
+        case 7:
+          return "CloseBraceExpected";
+        case 8:
+          return "CloseBracketExpected";
+        case 9:
+          return "EndOfFileExpected";
+        case 10:
+          return "InvalidCommentToken";
+        case 11:
+          return "UnexpectedEndOfComment";
+        case 12:
+          return "UnexpectedEndOfString";
+        case 13:
+          return "UnexpectedEndOfNumber";
+        case 14:
+          return "InvalidUnicode";
+        case 15:
+          return "InvalidEscapeCharacter";
+        case 16:
+          return "InvalidCharacter";
+      }
+      return "<unknown ParseErrorCode>";
+    }
+    exports2.printParseErrorCode = printParseErrorCode;
+    function format(documentText, range, options) {
+      return formatter.format(documentText, range, options);
+    }
+    exports2.format = format;
+    function modify(text, path, value, options) {
+      return edit.setProperty(text, path, value, options);
+    }
+    exports2.modify = modify;
+    function applyEdits(text, edits) {
+      let sortedEdits = edits.slice(0).sort((a2, b2) => {
+        const diff = a2.offset - b2.offset;
+        if (diff === 0) {
+          return a2.length - b2.length;
+        }
+        return diff;
+      });
+      let lastModifiedOffset = text.length;
+      for (let i2 = sortedEdits.length - 1;i2 >= 0; i2--) {
+        let e2 = sortedEdits[i2];
+        if (e2.offset + e2.length <= lastModifiedOffset) {
+          text = edit.applyEdit(text, e2);
+        } else {
+          throw new Error("Overlapping edit");
+        }
+        lastModifiedOffset = e2.offset;
+      }
+      return text;
+    }
+    exports2.applyEdits = applyEdits;
+  });
+});
+
 // src/utils/process.ts
 import { spawn } from "node:child_process";
 async function exec(command, options = {}) {
@@ -13486,47 +13632,6 @@ var init_process = () => {};
 
 // src/core/wrangler.ts
 import { join as join6 } from "node:path";
-function stripJsonc(text) {
-  let result = "";
-  let i2 = 0;
-  let inString = false;
-  while (i2 < text.length) {
-    if (inString) {
-      result += text[i2];
-      if (text[i2] === "\\" && i2 + 1 < text.length) {
-        result += text[i2 + 1];
-        i2 += 2;
-        continue;
-      }
-      if (text[i2] === '"')
-        inString = false;
-      i2++;
-      continue;
-    }
-    if (text[i2] === '"') {
-      inString = true;
-      result += text[i2];
-      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;
-    }
-    result += text[i2];
-    i2++;
-  }
-  return result.replace(/,(\s*[}\]])/g, "$1");
-}
 async function checkWrangler() {
   const result = await exec(["npx", "wrangler", "--version"]);
   return result.success;
@@ -13581,23 +13686,28 @@ function findWranglerConfig(appPath) {
   }
   return;
 }
-async function updateWranglerVars(appPath, vars) {
+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);
-  config.vars = { ...config.vars || {}, ...vars };
-  await writeFile(configPath, JSON.stringify(config, null, 2) + `
-`);
+  const config = import_jsonc_parser.parse(content);
+  const envSection = config?.env ?? {};
+  const existingVars = envSection[environment]?.vars ?? {};
+  const mergedVars = { ...existingVars, ...vars };
+  const fmt = { tabSize: 2, insertSpaces: true };
+  const edits = import_jsonc_parser.modify(content, ["env", environment, "vars"], mergedVars, { formattingOptions: fmt });
+  const updated = import_jsonc_parser.applyEdits(content, edits);
+  await writeFile(configPath, updated);
   return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
 }
+var import_jsonc_parser;
 var init_wrangler = __esm(() => {
   init_dist2();
   init_process();
   init_fs();
+  import_jsonc_parser = __toESM(require_main3(), 1);
 });
 
 // src/commands/push.ts
@@ -13775,7 +13885,7 @@ var init_push = __esm(() => {
           }
         }
         if (varsCount > 0) {
-          const varsResult = await updateWranglerVars(app.absolutePath, varsToPush);
+          const varsResult = await updateWranglerVars(app.absolutePath, environment, varsToPush);
           if (varsResult.success) {
             consola.success(`  Wrote ${varsCount} vars to ${varsResult.filePath}`);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cf-envsync",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "description": "Sync .env files to Cloudflare Workers secrets, .dev.vars, and more",
   "type": "module",
   "exports": {
@@ -33,7 +33,8 @@
     "@dotenvx/dotenvx": "^1.52.0",
     "citty": "^0.2.1",
     "consola": "^3.4.2",
-    "jiti": "^2.4.2"
+    "jiti": "^2.4.2",
+    "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
     "@types/node": "^22"