diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts index 9e7b4be79..7eaec679d 100644 --- a/__tests__/utils.test.ts +++ b/__tests__/utils.test.ts @@ -136,6 +136,9 @@ describe('Utils tests', () => { 'b=3, 4', 'c=5' ]); + expect( + await utils.CSVArray('a=E_ALL, b=E_ALL & ~ E_ALL, c="E_ALL", d=\'E_ALL\'') + ).toEqual(['a=E_ALL', 'b=E_ALL & ~ E_ALL', 'c=E_ALL', 'd=E_ALL']); expect(await utils.CSVArray('')).toEqual([]); expect(await utils.CSVArray(' ')).toEqual([]); }); diff --git a/dist/index.js b/dist/index.js index e2190853c..75cbe17ea 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1285,7 +1285,7 @@ async function CSVArray(values_csv) { return value .trim() .replace(/^["']|["']$|(?<==)["']/g, '') - .replace(/=(.*[?{}|&~![()^]+.*)/, "='$1'"); + .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'"); }) .filter(Boolean); } diff --git a/src/utils.ts b/src/utils.ts index 5391cc599..cb3af9c09 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -273,7 +273,7 @@ export async function CSVArray(values_csv: string): Promise> { return value .trim() .replace(/^["']|["']$|(?<==)["']/g, '') - .replace(/=(.*[?{}|&~![()^]+.*)/, "='$1'"); + .replace(/=(((?!E_).)*[?{}|&~![()^]+((?!E_).)+)/, "='$1'"); }) .filter(Boolean); }