Remove Quick and Nimble; redesign arrayLookup and lookup

iWECon · Dec 30, 2022 · 8147fa4 · 8147fa4
1 parent 7e40ce5
commit 8147fa4
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 287 deletions.
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -14,17 +14,12 @@ let package = Package(
     products: [
         .library(name: "Lookup", targets: ["Lookup"]),
     ],
-    dependencies: [
-        .package(url: "https://github.com/Quick/Quick.git", from: "4.0.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0")
-    ],
     targets: [
         .target(name: "Lookup", dependencies: []),
         .testTarget(
             name: "LookupTests",
             dependencies: [
-                "Lookup",
-                "Quick", "Nimble"
+                "Lookup"
             ])
     ],
     swiftLanguageVersions: [.v5]

diff --git a/Sources/Lookup/Lookup.swift b/Sources/Lookup/Lookup.swift
@@ -513,22 +513,26 @@ public extension Lookup {
         array!
     }
 
-    var arrayLookup: Lookup {
+    var arrayLookup: [Lookup] {
         switch rawType {
         case .array:
-            return Lookup(rawArray)
+            return rawArray.map { Lookup($0) }
         case .string:
             if let originString = object as? String,
                let stringData = originString.data(using: .utf8),
                let _array = try? JSONSerialization.jsonObject(with: stringData, options: []) as? [Any]
             {
-                return Lookup(_array)
+                return _array.map { Lookup($0) }
             }
-            return .null
+            return []
         default:
-            return .null
+            return []
         }
     }
+
+    var lookup: Lookup {
+        Lookup(rawValue)
+    }
 }