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

review changes

Browse Source
This commit is contained in:
Scott Pfeil 2022-01-24 18:14:37 -05:00
parent f2d824f829
commit 306e66a3b2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MVMCore/MVMCore/Models/JSON/JSONHelper.swift
View File

@ -20,11 +20,11 @@ public enum JSONError: Error {
extension JSONDictionary {
public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? {
guard let data = try? JSONSerialization.data(withJSONObject: self, options: options),
let string = String(data: data, encoding: .utf8) else {
return nil
}
public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String {
let data = try JSONSerialization.data(withJSONObject: self, options: options)
guard let string = String(data: data, encoding: .utf8) else {
throw JSONError.error(message: "Failed to convert data to string")
}
return string
}
@ -32,10 +32,10 @@ extension JSONDictionary {
var queryItems: [URLQueryItem] = []
for (key, value) in self {
var valueString: String
if let value = value as? JSONDictionary, let jsonString = value.toJSONString() {
valueString = jsonString
} else if let value = value as? [AnyHashable], let jsonString = value.toJSONString() {
valueString = jsonString
if let value = value as? JSONDictionary {
valueString = try value.toJSONString()
} else if let value = value as? [AnyHashable] {
valueString = try value.toJSONString()
} else {
guard let baseValueString = String(describing: value.base).removingPercentEncoding else {
throw JSONError.error(message: "query item failed: \(key) value \(value.base)")
@ -51,11 +51,11 @@ extension JSONDictionary {
extension Array where Element == AnyHashable {
public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? {
guard let data = try? JSONSerialization.data(withJSONObject: self, options: options),
let string = String(data: data, encoding: .utf8) else {
return nil
}
public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String {
let data = try JSONSerialization.data(withJSONObject: self, options: options)
guard let string = String(data: data, encoding: .utf8) else {
throw JSONError.error(message: "Failed to convert data to string")
}
return string
}
}