mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/JSONValue-Update' into 'develop'

Browse Source 
updated JSONValue with Helper methods

See merge request BPHV_MIPS/mvm_core!213
This commit is contained in:
Pfeil, Scott Robert 2022-06-24 16:10:41 +00:00
commit fa6f79f3d0
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MVMCore/MVMCore/Models/Extensions/Encoder.swift
View File

@ -34,6 +34,15 @@ extension Encodable {
return jsonAny
}
public func toJSONArray() throws -> [Any] {
let data = try self.encode()
let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
guard let jsonArray = json as? [Any] else {
throw JSONError.error(message: "JSON Array not found")
}
return jsonArray
}
public func toJSONString() -> String? {
guard let json = self.toJSON(),
let data = try? JSONSerialization.data(withJSONObject: json, options: .prettyPrinted),

33
MVMCore/MVMCore/Models/JSON/JSONValue.swift
View File

@ -13,6 +13,7 @@ public typealias JSONValueDictionary = [String: JSONValue]
public enum JSONValueError: Error {
case encode
case TypeMismatch
}
extension Optional {
@ -68,6 +69,38 @@ public enum JSONValue: Codable, Equatable {
case .null: break
}
}
public var base: Any {
switch self {
case .string(let string): return string
case .int(let int): return int
case .double(let double): return double
case .bool(let bool): return bool
case .object(let object): return try! object.toJSONAny()
case .array(let array): return try! array.toJSONArray()
case .null: return NSNull()
}
}
public func value<T>() throws -> T {
guard let base = self.base as? T else {
throw JSONValueError.TypeMismatch
}
return base
}
private func value<T>(type: T.Type) throws -> T {
let base: T = try value()
return base
}
public func toString() throws -> String { try value(type: String.self) }
public func toDouble() throws -> Double { try value(type: Double.self) }
public func toInt() throws -> Int { try value(type: Int.self) }
public func toBool() throws -> Bool { try value(type: Bool.self) }
public func toArray<T>(of type: T.Type) throws -> [T]{ try value(type: [T].self) }
public func toObject<T>(of type: T.Type) throws -> T { try value(type: T.self) }
}
public func ==(lhs: JSONValue, rhs: JSONValue) -> Bool {