fix: ignore escaped delimiters

oclif · Jul 26, 2024 · 2b90c21 · 2b90c21
1 parent 501c4e9
commit 2b90c21
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/parser/parse.ts b/src/parser/parse.ts
@@ -412,17 +412,27 @@ export class Parser<
 
         // multiple with custom delimiter
         if (fws.inputFlag.flag.type === 'option' && fws.inputFlag.flag.delimiter && fws.inputFlag.flag.multiple) {
+          // regex that will identify unescaped delimiters
+          const makeDelimiter = (delimiter: string) => new RegExp(`(?<!\\\\)${delimiter}`)
           return {
             ...fws,
             valueFunction: async (i) =>
               (
                 await Promise.all(
                   (i.tokens ?? [])
-                    .flatMap((token) => token.input.split((i.inputFlag.flag as OptionFlag<any>).delimiter ?? ','))
+                    .flatMap((token) =>
+                      token.input.split(makeDelimiter((i.inputFlag.flag as OptionFlag<any>).delimiter ?? ',')),
+                    )
                     // trim, and remove surrounding doubleQuotes (which would hav been needed if the elements contain spaces)
                     .map((v) =>
                       v
                         .trim()
+                        // remove escaped characters from delimiter
+                        // example: --opt="a\,b,c" -> ["a,b", "c"]
+                        .replaceAll(
+                          new RegExp(`\\\\${(i.inputFlag.flag as OptionFlag<any>).delimiter}`, 'g'),
+                          (i.inputFlag.flag as OptionFlag<any>).delimiter ?? ',',
+                        )
                         .replace(/^"(.*)"$/, '$1')
                         .replace(/^'(.*)'$/, '$1'),
                     )

diff --git a/test/parser/parse.test.ts b/test/parser/parse.test.ts
@@ -646,6 +646,14 @@ See more help with --help`)
             expect(error.message).to.include('Expected --foo=b c to be one of: a a, b b')
           }
         })
+        it('does not split on escaped delimiter', async () => {
+          const out = await parse(['--foo', 'a\\,b,c'], {
+            flags: {
+              foo: Flags.string({multiple: true, delimiter: ','}),
+            },
+          })
+          expect(out.flags).to.deep.include({foo: ['a,b', 'c']})
+        })
       })
     })