Merge pull request #421 from zapcannon87/master

zapcannon87 · web-flow · commit 7a7512f41b19 · 2021-03-29T16:41:36.000+08:00
fix: formatted JSON string of Object probably NOT right
diff --git a/.version b/.version
@@ -1 +1 @@
-17.7.0
+17.7.1
diff --git a/LeanCloud.podspec b/LeanCloud.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'LeanCloud'
-  s.version      = '17.7.0'
+  s.version      = '17.7.1'
   s.license      = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
   s.summary      = 'LeanCloud Swift SDK'
   s.homepage     = 'https://leancloud.cn/'
diff --git a/LeanCloudTests/LCObjectTestCase.swift b/LeanCloudTests/LCObjectTestCase.swift
@@ -345,38 +345,6 @@ class LCObjectTestCase: BaseTestCase {
         dictionary.foo = "bar"
         XCTAssertEqual(dictionary.foo?.stringValue, "bar")
     }
-
-    func testJSONString() {
-        XCTAssertEqual(LCNull().jsonString, "null")
-        XCTAssertEqual(LCNumber(1).jsonString, "1")
-        XCTAssertEqual(LCNumber(3.14).jsonString, "3.14")
-        XCTAssertEqual(LCBool(true).jsonString, "true")
-        XCTAssertEqual(LCString("foo").jsonString, "\"foo\"")
-        XCTAssertEqual(try LCArray(unsafeObject: [1, true, [0, false]]).jsonString, """
-        [
-            1,
-            true,
-            [
-                0,
-                false
-            ]
-        ]
-        """)
-        XCTAssertEqual(try LCDictionary(unsafeObject: ["foo": "bar", "bar": ["bar": "baz"]]).jsonString, """
-        {
-            "bar": {
-                "bar": "baz"
-            },
-            "foo": "bar"
-        }
-        """)
-        XCTAssertEqual(LCObject().jsonString, """
-        {
-            "__type": "Object",
-            "className": "LCObject"
-        }
-        """)
-    }
     
     func testBatchChildren() {
         let object1 = LCObject(className: "BatchChildren")
diff --git a/Sources/Foundation/ACL.swift b/Sources/Foundation/ACL.swift
@@ -68,14 +68,6 @@ public final class LCACL: NSObject, LCValue, LCValueExtension {
         return value
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return LCDictionary(value).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self
     }
diff --git a/Sources/Foundation/Array.swift b/Sources/Foundation/Array.swift
@@ -100,10 +100,6 @@ public class LCArray: NSObject, LCValue, Collection, ExpressibleByArrayLiteral {
         return self.value.map { $0.jsonValue }
     }
 
-    public var jsonString: String {
-        return self.formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value.map { $0.rawValue }
     }
@@ -160,19 +156,4 @@ extension LCArray: LCValueExtension {
     func differInPlace(_ elements: [Element]) {
         self.value = (self.value - elements)
     }
-    
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        if self.value.isEmpty {
-            return "[]"
-        }
-        let lastIndent = " " * (numberOfSpacesForOneIndentLevel * indentLevel)
-        let bodyIndent = " " * (numberOfSpacesForOneIndentLevel * (indentLevel + 1))
-        let body = self.value
-            .compactMap {
-                ($0 as? LCValueExtension)?.formattedJSONString(
-                    indentLevel: indentLevel + 1,
-                    numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel) }
-            .joined(separator: ",\n" + bodyIndent)
-        return "[\n\(bodyIndent)\(body)\n\(lastIndent)]"
-    }
 }
diff --git a/Sources/Foundation/Bool.swift b/Sources/Foundation/Bool.swift
@@ -58,14 +58,6 @@ public final class LCBool: NSObject, LCValue, LCValueExtension, ExpressibleByBoo
         return value
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return "\(value)"
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value
     }
diff --git a/Sources/Foundation/Data.swift b/Sources/Foundation/Data.swift
@@ -97,14 +97,6 @@ public final class LCData: NSObject, LCValue, LCValueExtension {
         ]
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value
     }
diff --git a/Sources/Foundation/Date.swift b/Sources/Foundation/Date.swift
@@ -132,14 +132,6 @@ public final class LCDate: NSObject, LCValue, LCValueExtension {
         ]
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value
     }
diff --git a/Sources/Foundation/Dictionary.swift b/Sources/Foundation/Dictionary.swift
@@ -155,26 +155,6 @@ public final class LCDictionary: NSObject, LCValue, LCValueExtension, Collection
         return value.compactMapValue { value in value.jsonValue }
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        if value.isEmpty {
-            return "{}"
-        }
-
-        let lastIndent = " " * (numberOfSpacesForOneIndentLevel * indentLevel)
-        let bodyIndent = " " * (numberOfSpacesForOneIndentLevel * (indentLevel + 1))
-        let body = value
-            .map    { (key, value)  in (key, (value as! LCValueExtension).formattedJSONString(indentLevel: indentLevel + 1, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)) }
-            .sorted { (left, right) in left.0 < right.0 }
-            .map    { (key, value)  in "\"\(key.doubleQuoteEscapedString)\": \(value)" }
-            .joined(separator: ",\n" + bodyIndent)
-
-        return "{\n\(bodyIndent)\(body)\n\(lastIndent)}"
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         let v: [String: Any] = self.value.mapValue { value in value.rawValue }
         return v
diff --git a/Sources/Foundation/GeoPoint.swift b/Sources/Foundation/GeoPoint.swift
@@ -104,14 +104,6 @@ public final class LCGeoPoint: NSObject, LCValue, LCValueExtension {
         ]
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self
     }
diff --git a/Sources/Foundation/Installation.swift b/Sources/Foundation/Installation.swift
@@ -166,12 +166,12 @@ extension LCInstallation {
     static func currentInstallation(application: LCApplication) -> LCInstallation? {
         do {
             guard let fileURL = application.currentInstallationFileURL,
-                let context = application.localStorageContext,
-                let table: CacheTable = try context.table(from: fileURL),
-                table.applicationID == application.id,
-                let data = table.jsonString.data(using: .utf8),
-                let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-                    return nil
+                  let context = application.localStorageContext,
+                  let table: CacheTable = try context.table(from: fileURL),
+                  table.applicationID == application.id,
+                  let data = table.jsonString.data(using: .utf8),
+                  let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+                return nil
             }
             let dictionary = try LCDictionary(
                 application: application,
@@ -188,15 +188,15 @@ extension LCInstallation {
     static func saveCurrentInstallation(_ installation: LCInstallation) {
         let application = installation.application
         guard let context = application.localStorageContext,
-            let fileURL = application.currentInstallationFileURL else {
-                return
+              let fileURL = application.currentInstallationFileURL else {
+            return
         }
         do {
-            try context.save(
-                table: CacheTable(
-                    jsonString: installation.jsonString,
-                    applicationID: application.id),
-                to: fileURL)
+            if let installationJSONValue = installation.jsonValue as? [String: Any],
+               let installationJSONString = try installationJSONValue.jsonString() {
+                let table = CacheTable(jsonString: installationJSONString, applicationID: application.id)
+                try context.save(table: table, to: fileURL)
+            }
         } catch {
             Logger.shared.error(error)
         }
diff --git a/Sources/Foundation/Null.swift b/Sources/Foundation/Null.swift
@@ -40,14 +40,6 @@ public final class LCNull: NSObject, LCValue, LCValueExtension {
         return NSNull()
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return "null"
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return NSNull()
     }
diff --git a/Sources/Foundation/Number.swift b/Sources/Foundation/Number.swift
@@ -62,14 +62,6 @@ public final class LCNumber: NSObject, LCValue, LCValueExtension, ExpressibleByF
         return value
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return String(format: "%g", value)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value
     }
diff --git a/Sources/Foundation/Object.swift b/Sources/Foundation/Object.swift
@@ -278,24 +278,11 @@ open class LCObject: NSObject, LCValue, LCValueExtension, Sequence {
         return result
     }
 
-    open var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self
     }
     
     // MARK: LCValueExtension
-    
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        let dictionary = LCDictionary(self.dictionary)
-        
-        dictionary["__type"] = "Object".lcString
-        dictionary["className"] = actualClassName.lcString
-        
-        return dictionary.formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
 
     var lconValue: Any? {
         guard let objectId = objectId else {
diff --git a/Sources/Foundation/Relation.swift b/Sources/Foundation/Relation.swift
@@ -124,14 +124,6 @@ public final class LCRelation: NSObject, LCValue, LCValueExtension, Sequence {
         return result
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self
     }
diff --git a/Sources/Foundation/String.swift b/Sources/Foundation/String.swift
@@ -69,14 +69,6 @@ public final class LCString: NSObject, LCValue, LCValueExtension, ExpressibleByS
         return value
     }
 
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {
-        return "\"\(value.doubleQuoteEscapedString)\""
-    }
-
-    public var jsonString: String {
-        return formattedJSONString(indentLevel: 0)
-    }
-
     public var rawValue: Any {
         return self.value
     }
diff --git a/Sources/Foundation/User.swift b/Sources/Foundation/User.swift
@@ -72,19 +72,18 @@ open class LCUser: LCObject {
     
     static func saveCurrentUser(application: LCApplication, user: LCUser?) {
         guard let context = application.localStorageContext,
-            let fileURL = application.currentUserFileURL else {
-                return
+              let fileURL = application.currentUserFileURL else {
+            return
         }
         do {
             if let user = user {
-                try context.save(
-                    table: CacheTable(
-                        jsonString: user.jsonString,
-                        applicationID: application.id),
-                    to: fileURL)
+                if let userJSONValue = user.jsonValue as? [String: Any],
+                   let userJSONString = try userJSONValue.jsonString() {
+                    let table = CacheTable(jsonString: userJSONString, applicationID: application.id)
+                    try context.save(table: table, to: fileURL)
+                }
             } else {
-                try context.clear(
-                    file: fileURL)
+                try context.clear(file: fileURL)
             }
         } catch {
             Logger.shared.error(error)
@@ -94,12 +93,12 @@ open class LCUser: LCObject {
     static func currentUser(application: LCApplication) -> LCUser? {
         do {
             guard let fileURL = application.currentUserFileURL,
-                let context = application.localStorageContext,
-                let table: CacheTable = try context.table(from: fileURL),
-                table.applicationID == application.id,
-                let data = table.jsonString.data(using: .utf8),
-                let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-                    return nil
+                  let context = application.localStorageContext,
+                  let table: CacheTable = try context.table(from: fileURL),
+                  table.applicationID == application.id,
+                  let data = table.jsonString.data(using: .utf8),
+                  let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+                return nil
             }
             let dictionary = try LCDictionary(
                 application: application,
diff --git a/Sources/Foundation/Valuable.swift b/Sources/Foundation/Valuable.swift
@@ -19,11 +19,6 @@ public protocol LCValue: NSObjectProtocol, NSCoding, NSCopying, LCValueConvertib
      */
     var jsonValue: Any { get }
 
-    /**
-     The pretty description.
-     */
-    var jsonString: String { get }
-
     /**
      The raw value of current value.
 
@@ -211,16 +206,6 @@ protocol LCValueExtension: LCValue {
      - returns: The difference result.
      */
     func differ(_ other: LCValue) throws -> LCValue
-
-    /**
-     Get formatted JSON string with indent.
-
-     - parameter indentLevel: The indent level.
-     - parameter numberOfSpacesForOneIndentLevel: The number of spaces for one indent level.
-
-     - returns: The JSON string.
-     */
-    func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int) -> String
 }
 
 /**
diff --git a/Sources/Foundation/Version.swift b/Sources/Foundation/Version.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 public struct Version {
-    public static let versionString = "17.7.0"
+    public static let versionString = "17.7.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,6 @@ public final class LCACL: NSObject, LCValue, LCValueExtension {`
`68`	`68`	`return value`
`69`	`69`	`}`
`70`	`70`
`71`		`- func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {`
`72`		`- return LCDictionary(value).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)`
`73`		`- }`
`74`		`-`
`75`		`- public var jsonString: String {`
`76`		`- return formattedJSONString(indentLevel: 0)`
`77`		`- }`
`78`		`-`
`79`	`71`	`public var rawValue: Any {`
`80`	`72`	`return self`
`81`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,6 @@ public final class LCBool: NSObject, LCValue, LCValueExtension, ExpressibleByBoo`
`58`	`58`	`return value`
`59`	`59`	`}`
`60`	`60`
`61`		`- func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {`
`62`		`- return "\(value)"`
`63`		`- }`
`64`		`-`
`65`		`- public var jsonString: String {`
`66`		`- return formattedJSONString(indentLevel: 0)`
`67`		`- }`
`68`		`-`
`69`	`61`	`public var rawValue: Any {`
`70`	`62`	`return self.value`
`71`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,6 @@ public final class LCData: NSObject, LCValue, LCValueExtension {`
`97`	`97`	`]`
`98`	`98`	`}`
`99`	`99`
`100`		`- func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {`
`101`		`- return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)`
`102`		`- }`
`103`		`-`
`104`		`- public var jsonString: String {`
`105`		`- return formattedJSONString(indentLevel: 0)`
`106`		`- }`
`107`		`-`
`108`	`100`	`public var rawValue: Any {`
`109`	`101`	`return self.value`
`110`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,14 +132,6 @@ public final class LCDate: NSObject, LCValue, LCValueExtension {`
`132`	`132`	`]`
`133`	`133`	`}`
`134`	`134`
`135`		`- func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {`
`136`		`- return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)`
`137`		`- }`
`138`		`-`
`139`		`- public var jsonString: String {`
`140`		`- return formattedJSONString(indentLevel: 0)`
`141`		`- }`
`142`		`-`
`143`	`135`	`public var rawValue: Any {`
`144`	`136`	`return self.value`
`145`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,14 +104,6 @@ public final class LCGeoPoint: NSObject, LCValue, LCValueExtension {`
`104`	`104`	`]`
`105`	`105`	`}`
`106`	`106`
`107`		`- func formattedJSONString(indentLevel: Int, numberOfSpacesForOneIndentLevel: Int = 4) -> String {`
`108`		`- return LCDictionary(typedJSONValue).formattedJSONString(indentLevel: indentLevel, numberOfSpacesForOneIndentLevel: numberOfSpacesForOneIndentLevel)`
`109`		`- }`
`110`		`-`
`111`		`- public var jsonString: String {`
`112`		`- return formattedJSONString(indentLevel: 0)`
`113`		`- }`
`114`		`-`
`115`	`107`	`public var rawValue: Any {`
`116`	`108`	`return self`
`117`	`109`	`}`