feat(Args): Parsing single arguments in anywhere instead of single on…

…e in trailing of options
devedbox · Oct 28, 2018 · a92b897 · a92b897
1 parent 5f44f7b
commit a92b897
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 18 deletions.
diff --git a/Sources/Commander/Options/OptionsDecoder.swift b/Sources/Commander/Options/OptionsDecoder.swift
@@ -74,6 +74,9 @@ internal extension Array where Element: RangeReplaceableCollection {
 internal extension Collection {
   /// Returns a bool value indicates if the collection is containing only one element.
   internal var isSingle: Bool {
+    guard !isEmpty else {
+      return false
+    }
     return index(after: startIndex) == endIndex
   }
 }
@@ -519,21 +522,18 @@ public final class OptionsDecoder {
 
     let validArguments = codingArguments.filter { !$0.value.isEmpty }
 
-    if
-      let isLastArgumentsEmpty = codingArguments.lastArguments?.isEmpty,
-      isLastArgumentsEmpty,
-      !validArguments.isEmpty
-    {
-      throw OptionsDecoder.Error.unrecognizedArguments(Array(validArguments.values.flatMap { $0 }).compactMap { $0.unwrapped })
-    } else {
-      if !validArguments.isEmpty {
-        container.arrayValue = Array(validArguments.values).last
-        if let args = container.arrayValue, !args.isEmpty {
-          decoder.container = .init(container, referencing: self)
-          decoder.storage = .init()
-          decoder.storage.push(container)
-          decoded.arguments = try decoder.decode(as: [T.ArgumentsResolver.Argument].self)
-        }
+    if !validArguments.isEmpty {
+      /* if let isLastArgumentsEmpty = codingArguments.lastArguments?.isEmpty, isLastArgumentsEmpty { */
+      if !validArguments.isSingle {
+        throw OptionsDecoder.Error.unrecognizedArguments(Array(validArguments.values.flatMap { $0 }).compactMap { $0.unwrapped })
+      }
+
+      container.arrayValue = Array(validArguments.values).last
+      if let args = container.arrayValue, !args.isEmpty {
+        decoder.container = .init(container, referencing: self)
+        decoder.storage = .init()
+        decoder.storage.push(container)
+        decoded.arguments = try decoder.decode(as: [T.ArgumentsResolver.Argument].self)
       }
     }
 

diff --git a/Tests/CommanderTests/OptionsDecoderTests.swift b/Tests/CommanderTests/OptionsDecoderTests.swift
@@ -680,7 +680,7 @@ class OptionsDecoderTests: XCTestCase {
     }
     do {
       _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S", "String", "-i", "5"])
-      XCTFail()
+      // XCTFail()
     } catch OptionsDecoder.Error.unrecognizedArguments(let args) {
       XCTAssertTrue(true)
       XCTAssertEqual(args as? [String], ["Bool"])
@@ -690,8 +690,19 @@ class OptionsDecoderTests: XCTestCase {
     }
 
     do {
-      _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S=String", "-i=5"])
+      _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S", "String", "String", "-i", "5"])
       XCTFail()
+    } catch OptionsDecoder.Error.unrecognizedArguments(let args) {
+      XCTAssertTrue(true)
+      XCTAssertEqual((args as? [String])?.set, ["Bool", "String"])
+      XCTAssertFalse(OptionsDecoder.Error.unrecognizedArguments(args).description.isEmpty)
+    } catch {
+      XCTFail()
+    }
+
+    do {
+      _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S=String", "-i=5"])
+      // XCTFail()
     } catch OptionsDecoder.Error.unrecognizedArguments(let args) {
       XCTAssertTrue(true)
       XCTAssertEqual(args as? [String], ["Bool"])
@@ -700,6 +711,17 @@ class OptionsDecoderTests: XCTestCase {
       XCTFail()
     }
 
+    do {
+      _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S=String", "String", "-i=5", "Int"])
+      XCTFail()
+    } catch OptionsDecoder.Error.unrecognizedArguments(let args) {
+      XCTAssertTrue(true)
+      XCTAssertEqual((args as? [String])?.set, ["Bool", "String", "Int"])
+      XCTAssertFalse(OptionsDecoder.Error.unrecognizedArguments(args).description.isEmpty)
+    } catch {
+      XCTFail()
+    }
+
     do {
       _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-vS=String", "-i=5"])
       XCTFail()
@@ -766,7 +788,7 @@ class OptionsDecoderTests: XCTestCase {
 
     do {
       _ = try OptionsDecoder().decode(ComplexArgumentsOptions.self, from: ["-b", "Bool", "-S", "String", "-i", "5"])
-      XCTFail()
+      // XCTFail()
     } catch OptionsDecoder.Error.unrecognizedArguments( let args) {
       XCTAssertTrue(true)
       XCTAssertFalse(OptionsDecoder.Error.unrecognizedArguments(args).description.isEmpty)