fix(flags): Handle space separated and double quoted multi-valued fla…

…gs PR#2 (#237)

* rewrite tokenizer and test

* update dist folder

* update dist folder

* eslint fix

* actions/upload-artifact to v4

---------

Co-authored-by: Gulom Alimov <[email protected]>

.github/workflows/verify-ts.yml

@@ -22,7 +22,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm clean-install
       - run: npm run lint:ci
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: lint report
@@ -38,12 +38,12 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm clean-install
       - run: npm run test:ci
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test report
           path: reports/sonar-report.xml
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: coverage report

src/utils.ts

@@ -1,22 +1,22 @@
 // tokenize functions splits a string of CLI flags by whitespace, additionally handling double-quoted
 // and space separated string values
 export function tokenize (input: string): string[] {
-  // Regular expression to find quoted strings or sequences of non-whitespace characters
-  const regex = /"([^"]*)"|\S+/g
+  // This regular expression looks for:
+  // 1. Sequences inside double quotes which may contain spaces (captured including the quotes)
+  // 2. Or sequences of non-space characters
+  const regex = /"[^"]*"|\S+/g
 
-  const tokens: string[] = []
-  let match: RegExpExecArray | null
+  const matches = input.match(regex)
+  if (matches == null) {
+    return []
+  }
 
-  // Use the exec method to find all matches in the input string
-  while ((match = regex.exec(input)) !== null) {
-    // match[1] will hold the matched content inside quotes if it exists,
-    // otherwise use match[0] which covers the non-quoted matches
-    if (match[1] !== undefined) {
-      tokens.push(match[1]) // Pushes the inside of the quotes to the array
-    } else {
-      tokens.push(match[0]) // Pushes the non-quoted match to the array
+  return matches.map(arg => {
+    // Preserve the double quotes around arguments
+    if (arg.startsWith('"') && arg.endsWith('"')) {
+      return arg
     }
-  }
 
-  return tokens
+    return arg
+  })
 }

test/utils.test.ts

@@ -8,26 +8,26 @@ describe('utils.tokenize', () => {
 
   it('should handle single quoted group', () => {
     const result = tokenize('--flag1 "multi value"')
-    expect(result).toEqual(['--flag1', 'multi value'])
+    expect(result).toEqual(['--flag1', '"multi value"'])
   })
 
   it('should handle multiple quoted groups', () => {
     const result = tokenize('--flag1 "multi value" --anotherFlag "another multi value" --flag333')
-    expect(result).toEqual(['--flag1', 'multi value', '--anotherFlag', 'another multi value', '--flag333'])
+    expect(result).toEqual(['--flag1', '"multi value"', '--anotherFlag', '"another multi value"', '--flag333'])
   })
 
   it('should handle empty quotes', () => {
     const result = tokenize('--flag1 "" --flag2')
-    expect(result).toEqual(['--flag1', '', '--flag2'])
+    expect(result).toEqual(['--flag1', '""', '--flag2'])
   })
 
   it('should correctly tokenize empty input', () => {
     const result = tokenize('')
     expect(result).toEqual([])
   })
 
-  it('should handle quotes without spaces in between', () => {
-    const result = tokenize('"first""second""third"')
-    expect(result).toEqual(['first', 'second', 'third'])
+  it('should handle comma separated and quoted values', () => {
+    const result = tokenize('--sources .github/scripts/kubernetes-namespace.sh --scriptArguments "setup,kube_name--space-cucumber,some--context--123"')
+    expect(result).toEqual(['--sources', '.github/scripts/kubernetes-namespace.sh', '--scriptArguments', '"setup,kube_name--space-cucumber,some--context--123"'])
   })
 })