From 127aea62b11858e78d0f0be268958301e8c14b23 Mon Sep 17 00:00:00 2001
From: "idan.d" <idandrd@gmail.com>
Date: Thu, 31 May 2018 19:09:46 +0300
Subject: [PATCH 1/5] added tests for multiple flag input

---
 test/parse.test.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/parse.test.ts b/test/parse.test.ts
index fe43694..ea20bb2 100644
--- a/test/parse.test.ts
+++ b/test/parse.test.ts
@@ -277,6 +277,33 @@ See more help with --help`)
     // })
   })
 
+  describe('flag with multiple inputs', () => {
+    it('flag multiple with flag in the middle', () => {
+      const out = parse(['--foo=bar', '--foo', '100', '--hello', 'world'], {
+        flags: {foo: flags.string({multiple: true}), hello: flags.string()},
+      })
+      expect(out.flags).to.deep.include({foo: ['bar', '100']})
+      expect(out.flags).to.deep.include({hello: 'world'})
+    })
+
+    it('flag multiple without flag in the middle', () => {
+      const out = parse(['--foo', './a.txt', './b.txt', './c.txt', '--hello', 'world'], {
+        flags: {foo: flags.string({multiple: true}), hello: flags.string()},
+      })
+      expect(out.flags).to.deep.include({foo: ['./a.txt', './b.txt', './c.txt']})
+      expect(out.flags).to.deep.include({hello: 'world'})
+    })
+
+    it('flag multiple with arguments', () => {
+      const out = parse(['--foo', './a.txt', './b.txt', './c.txt', '--', '15'], {
+        args: [{name: 'num'}],
+        flags: {foo: flags.string({multiple: true})},
+      })
+      expect(out.flags).to.deep.include({foo: ['./a.txt', './b.txt', './c.txt']})
+      expect(out.args).to.deep.include({num: '15'})
+    })
+  })
+
   describe('defaults', () => {
     it('defaults', () => {
       const out = parse([], {

From 554fe8cbf43544efa3fe8c0f97f2eaa6d3ffe113 Mon Sep 17 00:00:00 2001
From: "idan.d" <idandrd@gmail.com>
Date: Thu, 31 May 2018 19:10:23 +0300
Subject: [PATCH 2/5] added multiple flag input handling

withou the flag before each input
---
 src/parse.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/parse.ts b/src/parse.ts
index 04e1cb3..a61953f 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -47,8 +47,10 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
   private readonly raw: ParsingToken[] = []
   private readonly booleanFlags: { [k: string]: Flags.IBooleanFlag<any> }
   private readonly context: any
+  private _currentFlag: Flags.IOptionFlag<any> | null
   constructor(private readonly input: T) {
     const {pickBy} = m.util
+    this._currentFlag = null
     this.context = input.context || {}
     this.argv = input.argv.slice(0)
     this._setNames()
@@ -92,6 +94,7 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
       }
       const flag = this.input.flags[name]
       if (flag.type === 'option') {
+        this._currentFlag = flag
         let input
         if (long || arg.length < 3) {
           input = this.argv.shift()
@@ -125,6 +128,10 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
         }
         // not actually a flag if it reaches here so parse as an arg
       }
+      if (parsingFlags && this._currentFlag && this._currentFlag.multiple) {
+        this.raw.push({type: 'flag', flag: this._currentFlag.name, input})
+        continue
+      }
       // not a flag, parse as arg
       const arg = this.input.args[this._argTokens.length]
       if (arg) arg.input = input

From 92f5f671bf2deb877d6c9d85c3a5ddd167e4bd7f Mon Sep 17 00:00:00 2001
From: idan <idandrd@gmail.com>
Date: Thu, 31 May 2018 20:24:57 +0300
Subject: [PATCH 3/5] no underscore prefix

---
 src/parse.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/parse.ts b/src/parse.ts
index a61953f..5a8f5f2 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -47,10 +47,10 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
   private readonly raw: ParsingToken[] = []
   private readonly booleanFlags: { [k: string]: Flags.IBooleanFlag<any> }
   private readonly context: any
-  private _currentFlag: Flags.IOptionFlag<any> | null
+  private currentFlag: Flags.IOptionFlag<any> | null
   constructor(private readonly input: T) {
     const {pickBy} = m.util
-    this._currentFlag = null
+    this.currentFlag = null
     this.context = input.context || {}
     this.argv = input.argv.slice(0)
     this._setNames()
@@ -94,7 +94,7 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
       }
       const flag = this.input.flags[name]
       if (flag.type === 'option') {
-        this._currentFlag = flag
+        this.currentFlag = flag
         let input
         if (long || arg.length < 3) {
           input = this.argv.shift()
@@ -128,8 +128,8 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
         }
         // not actually a flag if it reaches here so parse as an arg
       }
-      if (parsingFlags && this._currentFlag && this._currentFlag.multiple) {
-        this.raw.push({type: 'flag', flag: this._currentFlag.name, input})
+      if (parsingFlags && this.currentFlag && this.currentFlag.multiple) {
+        this.raw.push({type: 'flag', flag: this.currentFlag.name, input})
         continue
       }
       // not a flag, parse as arg

From aeebec672ba595163156d41b5cd54800b7e5c13a Mon Sep 17 00:00:00 2001
From: idan <idandrd@gmail.com>
Date: Fri, 1 Jun 2018 10:59:09 +0300
Subject: [PATCH 4/5] use undefined instead of null

---
 src/parse.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/parse.ts b/src/parse.ts
index 5a8f5f2..dae89a4 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -47,10 +47,10 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
   private readonly raw: ParsingToken[] = []
   private readonly booleanFlags: { [k: string]: Flags.IBooleanFlag<any> }
   private readonly context: any
-  private currentFlag: Flags.IOptionFlag<any> | null
+  private currentFlag: Flags.IOptionFlag<any> | undefined
   constructor(private readonly input: T) {
     const {pickBy} = m.util
-    this.currentFlag = null
+    this.currentFlag = undefined
     this.context = input.context || {}
     this.argv = input.argv.slice(0)
     this._setNames()

From 2b3c0947b56a345e1b7c4626dfc603c40b0bdf99 Mon Sep 17 00:00:00 2001
From: idan <idandrd@gmail.com>
Date: Fri, 1 Jun 2018 11:45:41 +0300
Subject: [PATCH 5/5] current flag to be optional property

---
 src/parse.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/parse.ts b/src/parse.ts
index dae89a4..e4e0be2 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -47,10 +47,9 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
   private readonly raw: ParsingToken[] = []
   private readonly booleanFlags: { [k: string]: Flags.IBooleanFlag<any> }
   private readonly context: any
-  private currentFlag: Flags.IOptionFlag<any> | undefined
+  private currentFlag?: Flags.IOptionFlag<any>
   constructor(private readonly input: T) {
     const {pickBy} = m.util
-    this.currentFlag = undefined
     this.context = input.context || {}
     this.argv = input.argv.slice(0)
     this._setNames()