Handle KV values with = signs (#230)

Author: sethvargo

src/util.ts

@@ -208,18 +208,25 @@ export function parseKVString(str: string): KVPair {
   const pairs = str.split(/(?<!\\),/gi);
   for (let i = 0; i < pairs.length; i++) {
     const pair = pairs[i];
-    let [k, v] = pair.split('=', 2);
-    if (!k || !v) {
-      throw new SyntaxError(`Failed to parse KEY=VALUE pair "${pair}"`);
+    const firstEqual = pair.indexOf('=');
+    if (!firstEqual || firstEqual === -1) {
+      throw new SyntaxError(
+        `Failed to parse KEY=VALUE pair "${pair}": missing "="`,
+      );
     }
 
     // Trim any key whitespace and un-escape any escaped commas.
-    k = k.trim();
-    k = k.replace(/\\,/gi, ',');
+    const k = pair.slice(0, firstEqual).trim().replace(/\\,/gi, ',');
+    const v = pair
+      .slice(firstEqual + 1)
+      .trim()
+      .replace(/\\,/gi, ',');
 
-    // Trim any value whitespace and un-escape any escaped commas.
-    v = v.trim();
-    v = v.replace(/\\,/gi, ',');
+    if (!k || !v) {
+      throw new SyntaxError(
+        `Failed to parse KEY=VALUE pair "${pair}": no value`,
+      );
+    }
 
     result[k] = v;
   }

tests/util.test.ts

@@ -85,6 +85,31 @@ describe('Util', () => {
         input: 'FOO=bar,ZIP=zap',
         expected: { FOO: 'bar', ZIP: 'zap' },
       },
+      {
+        name: 'value with equals',
+        input: 'FOO=bar=baz',
+        expected: { FOO: 'bar=baz' },
+      },
+      {
+        name: 'value with many equals',
+        input: 'FOO=bar=baz;zip=zap;zinc=atom',
+        expected: { FOO: 'bar=baz;zip=zap;zinc=atom' },
+      },
+      {
+        name: 'comma-separated value with many equals',
+        input: 'FOO=bar=baz,ZIP=zap=flap==,ZINC=atom',
+        expected: { FOO: 'bar=baz', ZIP: 'zap=flap==', ZINC: 'atom' },
+      },
+      {
+        name: 'value with consecutive equals',
+        input: 'FOO=bar==baz;zip===zap;zinc====atom',
+        expected: { FOO: 'bar==baz;zip===zap;zinc====atom' },
+      },
+      {
+        name: 'value with trailing equals',
+        input: 'FOO=aGVsbG8gd29ybGQhCg==',
+        expected: { FOO: 'aGVsbG8gd29ybGQhCg==' },
+      },
       {
         name: 'trims',
         input: '  FOO= bar, ZIP=zap ',