Merge pull request #1056 from RomanPodymov/master

More Swift standard library functions

Sources/ImmutableMappable.swift

@@ -159,11 +159,9 @@ public extension Map {
 		guard let jsonDictionary = currentValue as? [String: Any] else {
 			throw MapError(key: key, currentValue: currentValue, reason: "Cannot cast to '[String: Any]'", file: file, function: function, line: line)
 		}
-		var value: [String: T] = [:]
-		for (key, json) in jsonDictionary {
-			value[key] = try Mapper<T>(context: context).mapOrFail(JSONObject: json)
+		return try jsonDictionary.mapValues { json in
+			return try Mapper<T>(context: context).mapOrFail(JSONObject: json)
 		}
-		return value
 	}
 
 	/// Returns a `[String: BaseMappable]` boxed in `Optional` or throws an error.
@@ -187,14 +185,12 @@ public extension Map {
 		guard let jsonDictionary = currentValue as? [String: Any] else {
 			throw MapError(key: key, currentValue: currentValue, reason: "Cannot cast to '[String: Any]'", file: file, function: function, line: line)
 		}
-		var value: [String: Transform.Object] = [:]
-		for (key, json) in jsonDictionary {
+		return try jsonDictionary.mapValues { json in
 			guard let object = transform.transformFromJSON(json) else {
 				throw MapError(key: key, currentValue: json, reason: "Cannot transform to '\(Transform.Object.self)' using \(transform)", file: file, function: function, line: line)
 			}
-			value[key] = object
+			return object
 		}
-		return value
 	}
 
 	/// Returns a `[String: BaseMappable]` using transform or throws an error.

Sources/Mapper.swift

@@ -189,7 +189,7 @@ public final class Mapper<N: BaseMappable> {
 	public func mapDictionary(JSON: [String: [String: Any]]) -> [String: N]? {
 		// map every value in dictionary to type N
 		let result = JSON.filterMap(map)
-		if result.isEmpty == false {
+		if !result.isEmpty {
 			return result
 		}
 
@@ -235,7 +235,7 @@ public final class Mapper<N: BaseMappable> {
 			mapArray(JSONArray: $0)
         }
 
-		if result.isEmpty == false {
+		if !result.isEmpty {
 			return result
 		}
 
@@ -245,13 +245,11 @@ public final class Mapper<N: BaseMappable> {
 	/// Maps an 2 dimentional array of JSON dictionaries to a 2 dimentional array of Mappable objects
 	public func mapArrayOfArrays(JSONObject: Any?) -> [[N]]? {
 		if let JSONArray = JSONObject as? [[[String: Any]]] {
-			var objectArray = [[N]]()
-			for innerJSONArray in JSONArray {
-				let array = mapArray(JSONArray: innerJSONArray)
-				objectArray.append(array)
+			let objectArray = JSONArray.map { innerJSONArray in
+				return mapArray(JSONArray: innerJSONArray)
 			}
 
-			if objectArray.isEmpty == false {
+			if !objectArray.isEmpty {
 				return objectArray
 			}
 		}

Sources/ToJSON.swift

@@ -42,24 +42,20 @@ private func setValue(_ value: Any, key: String, checkForNestedKeys: Bool, delim
 }
 
 private func setValue(_ value: Any, forKeyPathComponents components: ArraySlice<String>, dictionary: inout [String : Any]) {
-	if components.isEmpty {
+	guard let head = components.first else {
 		return
 	}
 
-	let head = components.first!
-
+	let headAsString = String(head)
 	if components.count == 1 {
-		dictionary[String(head)] = value
+		dictionary[headAsString] = value
 	} else {
-		var child = dictionary[String(head)] as? [String : Any]
-		if child == nil {
-			child = [:]
-		}
-
+		var child = dictionary[headAsString] as? [String : Any] ?? [:]
+
 		let tail = components.dropFirst()
-		setValue(value, forKeyPathComponents: tail, dictionary: &child!)
+		setValue(value, forKeyPathComponents: tail, dictionary: &child)
 
-		dictionary[String(head)] = child
+		dictionary[headAsString] = child
 	}
 }