fix: refactor args formatting (#52)

warapitiya · Jul 18, 2023 · 9f1d12f · 9f1d12f
1 parent f39b981
commit 9f1d12f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -15,14 +15,7 @@ export const PLUGIN_NAME = 'gulpYarn'
  * @param args string
  */
 export const formatArgument = (args: string): string => {
-  const arg = args.trim().replace(/\s\s+/g, ' ').split(/\s/)
-  return arg.map((l) => {
-    let result = l
-    while (!/--.*/.test(result))
-      result = `-${result}`
-
-    return result
-  }).join(' ')
+  return args.trim()
 }
 
 /**

diff --git a/test/utils.ts b/test/utils.ts
@@ -4,28 +4,27 @@ import { formatArgument, formatArguments, resolveYarnOptions } from '../src/util
 
 tap.test('formatArgument() returns formatted argument', (t) => {
   t.plan(8)
-  t.equal(formatArgument('production'), '--production')
+  t.equal(formatArgument('production'), 'production')
   t.equal(formatArgument('--production'), '--production')
-  t.equal(formatArgument('-production'), '--production')
-  t.equal(formatArgument('production --nice-work'), '--production --nice-work')
-  t.equal(formatArgument('--production nice-work'), '--production --nice-work')
-  t.equal(formatArgument('--production -nice-work'), '--production --nice-work')
-  t.equal(formatArgument('--production     --nice-work'), '--production --nice-work')
-  t.equal(formatArgument('--production     -nice-work'), '--production --nice-work')
+  t.equal(formatArgument('-production'), '-production')
+  t.equal(formatArgument('production --nice-work'), 'production --nice-work')
+  t.equal(formatArgument('--production nice-work'), '--production nice-work')
+  t.equal(formatArgument('--production -nice-work'), '--production -nice-work')
+  t.equal(formatArgument(' --production --nice-work '), '--production --nice-work')
   t.end()
 })
 
 tap.test('formatArguments() returns formatted arguments', (t) => {
   t.plan(9)
-  t.same(formatArguments(['production']), ['--production'])
+  t.same(formatArguments(['production']), ['production'])
   t.same(formatArguments(['--production']), ['--production'])
-  t.same(formatArguments(['-production']), ['--production'])
-  t.same(formatArguments(['production', '--nice-work']), ['--production', '--nice-work'])
-  t.same(formatArguments(['--production', 'nice-work']), ['--production', '--nice-work'])
-  t.same(formatArguments(['--production', '-nice-work']), ['--production', '--nice-work'])
+  t.same(formatArguments(['-production']), ['-production'])
+  t.same(formatArguments(['production', '--nice-work']), ['production', '--nice-work'])
+  t.same(formatArguments(['--production', 'nice-work']), ['--production', 'nice-work'])
+  t.same(formatArguments(['--production', '-nice-work']), ['--production', '-nice-work'])
   t.same(formatArguments(['--production', '    --nice-work']), ['--production', '--nice-work'])
-  t.same(formatArguments(['--production', '    -nice-work']), ['--production', '--nice-work'])
-  t.same(formatArguments('--production    -nice-work'), ['--production --nice-work'])
+  t.same(formatArguments(['--production', '    -nice-work  ']), ['--production', '-nice-work'])
+  t.same(formatArguments('--production    -nice-work'), ['--production    -nice-work'])
   t.end()
 })
 
@@ -44,11 +43,11 @@ tap.test('resolveYarnOptions() can resolve passed options', (t) => {
 
   [arg1, arg2] = resolveYarnOptions({ args: ['done'] })
   t.equal(arg1, null)
-  t.same(arg2, ['--done']);
+  t.same(arg2, ['done']);
 
-  [arg1, arg2] = resolveYarnOptions({ force: true, args: ['done'] })
+  [arg1, arg2] = resolveYarnOptions({ force: true, args: '--registry https://www.google.com' })
   t.equal(arg1, null)
-  t.same(arg2, ['--force', '--done']);
+  t.same(arg2, ['--force', '--registry https://www.google.com']);
 
   [arg1, arg2] = resolveYarnOptions()
   t.equal(arg1, null)