Merge pull request #274 from zapcannon87/developer

zapcannon87 · web-flow · commit b2f531f1de2e · 2019-12-02T18:38:45.000+08:00
fix: object post __type &amp; className
diff --git a/Sources/Foundation/CQLClient.swift b/Sources/Foundation/CQLClient.swift
@@ -112,6 +112,7 @@ public final class LCCQLClient {
      - parameter parameters: The parameters for placeholders in CQL statement.
      - parameter completion: The completion callback closure.
      */
+    @discardableResult
     public static func execute(
         application: LCApplication = LCApplication.default,
         _ cql: String, parameters: LCArrayConvertible? = nil,
diff --git a/Sources/Foundation/EngineClient.swift b/Sources/Foundation/EngineClient.swift
@@ -135,7 +135,13 @@ public class LCEngine {
         parameters: LCObject)
         -> LCValueOptionalResult
     {
-        return self.call(application: application, function, parameters: parameters.dictionary)
+        let dictionary = LCDictionary(parameters.dictionary)
+        dictionary.removeValue(forKey: "__type")
+        dictionary.removeValue(forKey: "className")
+        return self.call(
+            application: application,
+            function,
+            parameters: dictionary)
     }
     
     /// call the cloud function by RPC asynchronously
@@ -146,14 +152,23 @@ public class LCEngine {
     ///   - parameters: The parameters of the function
     ///   - completion: The result of the callback
     /// - Returns: The Request
+    @discardableResult
     public static func call(
         application: LCApplication = LCApplication.default,
         _ function: String,
         parameters: LCObject,
         completion: @escaping (LCValueOptionalResult) -> Void)
         -> LCRequest
     {
-        return self.call(application: application, function, parameters: parameters.dictionary, completion: completion)
+        let dictionary = LCDictionary(parameters.dictionary)
+        dictionary.removeValue(forKey: "__type")
+        dictionary.removeValue(forKey: "className")
+        return self.call(
+            application: application,
+            function,
+            parameters: dictionary,
+            completionQueue: completionQueue,
+            completion: completion)
     }
     
     @discardableResult
diff --git a/Sources/Foundation/Extension.swift b/Sources/Foundation/Extension.swift
@@ -306,22 +306,6 @@ extension LCError {
 
 }
 
-/**
- Synchronize on an object and do something.
-
- - parameter object: The object locked on.
- - parameter body: Something you want to do.
-
- - returns: Result of body.
- */
-func synchronize<T>(on object: Any, body: () throws -> T) rethrows -> T {
-    objc_sync_enter(object)
-
-    defer { objc_sync_exit(object) }
-
-    return try body()
-}
-
 /**
  Dispatch task in main queue asynchronously.
 
diff --git a/Sources/Foundation/File.swift b/Sources/Foundation/File.swift
@@ -107,6 +107,8 @@ public class LCFile: LCObject {
         return "_File"
     }
     
+    // MARK: Save
+    
     /// Save file synchronously.
     public func save() -> LCBooleanResult {
         return expect { fulfill in
@@ -162,7 +164,8 @@ public class LCFile: LCObject {
     @discardableResult
     private func save(
         progressInBackground progress: @escaping (Double) -> Void,
-        completion: @escaping (LCBooleanResult) -> Void) -> LCRequest
+        completion: @escaping (LCBooleanResult) -> Void)
+        -> LCRequest
     {
         let httpClient: HTTPClient = self.application.httpClient
         
@@ -197,7 +200,9 @@ public class LCFile: LCObject {
                 }
             }
             
-            let parameters = dictionary.jsonValue as? [String: Any]
+            var parameters = dictionary.jsonValue as? [String: Any]
+            parameters?.removeValue(forKey: "__type")
+            parameters?.removeValue(forKey: "className")
 
             return httpClient.request(.post, "files", parameters: parameters) { response in
                 let result = LCValueResult<LCDictionary>(response: response)
@@ -224,7 +229,8 @@ public class LCFile: LCObject {
     private func upload(
         payload: Payload,
         progress: @escaping (Double) -> Void,
-        completion: @escaping (LCBooleanResult) -> Void) -> LCRequest
+        completion: @escaping (LCBooleanResult) -> Void)
+        -> LCRequest
     {
         let uploader = FileUploader(file: self, payload: payload)
 
@@ -281,41 +287,24 @@ public class LCFile: LCObject {
     // MARK: Unavailable
     
     @available(*, unavailable)
-    public override class func save(
-        _ objects: [LCObject],
-        options: [LCObject.SaveOption] = [])
-        -> LCBooleanResult
-    {
+    public override class func save(_ objects: [LCObject], options: [LCObject.SaveOption] = []) -> LCBooleanResult {
         fatalError("not support")
     }
     
     @available(*, unavailable)
-    public override class func save(
-        _ objects: [LCObject],
-        options: [LCObject.SaveOption] = [],
-        completion: @escaping (LCBooleanResult) -> Void)
-        -> LCRequest
-    {
+    public override class func save(_ objects: [LCObject], options: [LCObject.SaveOption] = [], completion: @escaping (LCBooleanResult) -> Void) -> LCRequest {
         fatalError("not support")
     }
     
     @available(*, unavailable)
-    public override func save(
-        options: [LCObject.SaveOption] = [])
-        -> LCBooleanResult
-    {
+    public override func save(options: [LCObject.SaveOption] = []) -> LCBooleanResult {
         fatalError("not support")
     }
     
     @available(*, unavailable)
-    public override func save(
-        options: [LCObject.SaveOption] = [],
-        completion: @escaping (LCBooleanResult) -> Void)
-        -> LCRequest
-    {
+    public override func save(options: [LCObject.SaveOption] = [], completion: @escaping (LCBooleanResult) -> Void) -> LCRequest {
         fatalError("not support")
     }
-    
 }
 
 extension LCFile {
diff --git a/Sources/Foundation/FileUploader.swift b/Sources/Foundation/FileUploader.swift
@@ -263,6 +263,8 @@ class FileUploader {
         metaData["mime_type"] = attributes.mimeType
 
         parameters["metaData"] = metaData
+        parameters.removeValue(forKey: "__type")
+        parameters.removeValue(forKey: "className")
 
         return parameters
     }
diff --git a/Sources/Foundation/Installation.swift b/Sources/Foundation/Installation.swift
@@ -99,7 +99,12 @@ public class LCInstallation: LCObject {
         self.apnsTeamId = apnsTeamId.lcString
     }
 
-    override func preferredBatchRequest(method: HTTPClient.Method, path: String, internalId: String) throws -> [String : Any]? {
+    override func preferredBatchRequest(
+        method: HTTPClient.Method,
+        path: String,
+        internalId: String)
+        throws -> [String : Any]?
+    {
         switch method {
         case .post, .put:
             var request: [String: Any] = [:]
@@ -112,6 +117,8 @@ public class LCInstallation: LCObject {
 
                 body.removeValue(forKey: "createdAt")
                 body.removeValue(forKey: "updatedAt")
+                body.removeValue(forKey: "__type")
+                body.removeValue(forKey: "className")
 
                 request["body"] = body
             }
@@ -140,13 +147,12 @@ public class LCInstallation: LCObject {
             LCInstallation.saveCurrentInstallation(self)
         }
     }
-
 }
 
-// MARK: Cache
-
 extension LCInstallation {
     
+    // MARK: Cache
+    
     struct CacheTable: Codable {
         let jsonString: String
         let applicationID: String
@@ -195,31 +201,27 @@ extension LCInstallation {
             Logger.shared.error(error)
         }
     }
-    
 }
 
-// MARK: Device Token Conversion
+// MARK: Device Token Convertible
 
 public protocol LCDeviceTokenConvertible {
 
     var lcDeviceToken: LCString { get }
-
 }
 
 extension String: LCDeviceTokenConvertible {
 
     public var lcDeviceToken: LCString {
         return lcString
     }
-
 }
 
 extension NSString: LCDeviceTokenConvertible {
 
     public var lcDeviceToken: LCString {
         return (self as String).lcDeviceToken
     }
-
 }
 
 extension Data: LCDeviceTokenConvertible {
@@ -229,13 +231,11 @@ extension Data: LCDeviceTokenConvertible {
 
         return LCString(string)
     }
-
 }
 
 extension NSData: LCDeviceTokenConvertible {
 
     public var lcDeviceToken: LCString {
         return (self as Data).lcDeviceToken
     }
-
 }
diff --git a/Sources/Foundation/SMSClient.swift b/Sources/Foundation/SMSClient.swift
@@ -112,6 +112,7 @@ public final class LCSMSClient {
      - parameter variables:         The variables used to substitute placeholders in template.
      - parameter completion:        The completion callback closure.
      */
+    @discardableResult
     public static func requestShortMessage(
         application: LCApplication = LCApplication.default,
         mobilePhoneNumber: String,
@@ -170,6 +171,7 @@ public final class LCSMSClient {
      - parameter timeToLive:        The time to live of short message, in minutes. Defaults to 10 minutes.
      - parameter completion:        The completion callback closure.
      */
+    @discardableResult
     public static func requestVerificationCode(
         application: LCApplication = LCApplication.default,
         mobilePhoneNumber: String,
@@ -240,6 +242,7 @@ public final class LCSMSClient {
      - parameter mobilePhoneNumber: The mobile phone number where verification code will be sent to.
      - parameter completion:        The completion callback closure.
      */
+    @discardableResult
     public static func requestVoiceVerificationCode(
         application: LCApplication = LCApplication.default,
         mobilePhoneNumber: String,
@@ -297,6 +300,7 @@ public final class LCSMSClient {
      - parameter verificationCode:  The verification code.
      - parameter completion:        The completion callback closure.
      */
+    @discardableResult
     public static func verifyMobilePhoneNumber(
         application: LCApplication = LCApplication.default,
         _ mobilePhoneNumber: String,
diff --git a/Sources/Foundation/User.swift b/Sources/Foundation/User.swift
@@ -1166,6 +1166,8 @@ open class LCUser: LCObject {
         
         var parameters = (self.dictionary.jsonValue as? [String: Any]) ?? [:]
         parameters["authData"] = [platform.key: authData]
+        parameters.removeValue(forKey: "__type")
+        parameters.removeValue(forKey: "className")
         
         let path: String
         if let options = options, options.contains(.failOnNotExist) {
diff --git a/main.swift b/main.swift
@@ -212,14 +212,15 @@ class GitTask: Task {
     static func lastReleasableMessage() -> String? {
         var message: String?
         _ = GitTask(
-            arguments: ["log", "-10", "--pretty=%B|cat"])
+            arguments: ["log", "-16", "--pretty=%B|cat"])
             .excute(printOutput: false) {
                 let data = ($0.standardOutput as! Pipe).fileHandleForReading.readDataToEndOfFile()
                 message = String(data: data, encoding: .utf8)?
                     .components(separatedBy: .newlines)
                     .map({ s in s.trimmingCharacters(in: .whitespacesAndNewlines) })
                     .first(where: { (s) -> Bool in
-                        s.hasPrefix("feat") ||
+                        s.hasPrefix("release") ||
+                            s.hasPrefix("feat") ||
                             s.hasPrefix("fix") ||
                             s.hasPrefix("refactor") ||
                             s.hasPrefix("docs")
@@ -242,13 +243,34 @@ class HubTask: Task {
         }
     }
     
+    enum ReleaseDrafterLabel: String {
+        case breakingChanges = "feat!"
+        case newFeatures = "feat"
+        case bugFixes = "fix"
+        case maintenanceRefactor = "refactor"
+        case maintenanceDocs = "docs"
+    }
+    
     static func pullRequest(with message: String) throws {
         try version()
+        var label: String?
+        if message.hasPrefix(ReleaseDrafterLabel.breakingChanges.rawValue) {
+            label = ReleaseDrafterLabel.breakingChanges.rawValue
+        } else if message.hasPrefix(ReleaseDrafterLabel.newFeatures.rawValue) {
+            label = ReleaseDrafterLabel.newFeatures.rawValue
+        } else if message.hasPrefix(ReleaseDrafterLabel.bugFixes.rawValue) {
+            label = ReleaseDrafterLabel.bugFixes.rawValue
+        } else if message.hasPrefix(ReleaseDrafterLabel.maintenanceRefactor.rawValue) {
+            label = ReleaseDrafterLabel.maintenanceRefactor.rawValue
+        } else if message.hasPrefix(ReleaseDrafterLabel.maintenanceDocs.rawValue) {
+            label = ReleaseDrafterLabel.maintenanceDocs.rawValue
+        }
         guard HubTask(arguments: [
             "pull-request",
             "--base", "leancloud:master",
             "--message", message,
-            "--force", "--push", "--browse"])
+            "--force", "--push", "--browse"]
+            + (label != nil ? ["--labels", label!] : []))
             .excute() else {
                 throw TaskError()
         }

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,8 @@ class FileUploader {`
`263`	`263`	`metaData["mime_type"] = attributes.mimeType`
`264`	`264`
`265`	`265`	`parameters["metaData"] = metaData`
	`266`	`+ parameters.removeValue(forKey: "__type")`
	`267`	`+ parameters.removeValue(forKey: "className")`
`266`	`268`
`267`	`269`	`return parameters`
`268`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,12 @@ public class LCInstallation: LCObject {`
`99`	`99`	`self.apnsTeamId = apnsTeamId.lcString`
`100`	`100`	`}`
`101`	`101`
`102`		`- override func preferredBatchRequest(method: HTTPClient.Method, path: String, internalId: String) throws -> [String : Any]? {`
	`102`	`+ override func preferredBatchRequest(`
	`103`	`+ method: HTTPClient.Method,`
	`104`	`+ path: String,`
	`105`	`+ internalId: String)`
	`106`	`+ throws -> [String : Any]?`
	`107`	`+ {`
`103`	`108`	`switch method {`
`104`	`109`	`case .post, .put:`
`105`	`110`	`var request: [String: Any] = [:]`
`@@ -112,6 +117,8 @@ public class LCInstallation: LCObject {`
`112`	`117`
`113`	`118`	`body.removeValue(forKey: "createdAt")`
`114`	`119`	`body.removeValue(forKey: "updatedAt")`
	`120`	`+ body.removeValue(forKey: "__type")`
	`121`	`+ body.removeValue(forKey: "className")`
`115`	`122`
`116`	`123`	`request["body"] = body`
`117`	`124`	`}`
`@@ -140,13 +147,12 @@ public class LCInstallation: LCObject {`
`140`	`147`	`LCInstallation.saveCurrentInstallation(self)`
`141`	`148`	`}`
`142`	`149`	`}`
`143`		`-`
`144`	`150`	`}`
`145`	`151`
`146`		`-// MARK: Cache`
`147`		`-`
`148`	`152`	`extension LCInstallation {`
`149`	`153`
	`154`	`+ // MARK: Cache`
	`155`	`+`
`150`	`156`	`struct CacheTable: Codable {`
`151`	`157`	`let jsonString: String`
`152`	`158`	`let applicationID: String`
`@@ -195,31 +201,27 @@ extension LCInstallation {`
`195`	`201`	`Logger.shared.error(error)`
`196`	`202`	`}`
`197`	`203`	`}`
`198`		`-`
`199`	`204`	`}`
`200`	`205`
`201`		`-// MARK: Device Token Conversion`
	`206`	`+// MARK: Device Token Convertible`
`202`	`207`
`203`	`208`	`public protocol LCDeviceTokenConvertible {`
`204`	`209`
`205`	`210`	`var lcDeviceToken: LCString { get }`
`206`		`-`
`207`	`211`	`}`
`208`	`212`
`209`	`213`	`extension String: LCDeviceTokenConvertible {`
`210`	`214`
`211`	`215`	`public var lcDeviceToken: LCString {`
`212`	`216`	`return lcString`
`213`	`217`	`}`
`214`		`-`
`215`	`218`	`}`
`216`	`219`
`217`	`220`	`extension NSString: LCDeviceTokenConvertible {`
`218`	`221`
`219`	`222`	`public var lcDeviceToken: LCString {`
`220`	`223`	`return (self as String).lcDeviceToken`
`221`	`224`	`}`
`222`		`-`
`223`	`225`	`}`
`224`	`226`
`225`	`227`	`extension Data: LCDeviceTokenConvertible {`
`@@ -229,13 +231,11 @@ extension Data: LCDeviceTokenConvertible {`
`229`	`231`
`230`	`232`	`return LCString(string)`
`231`	`233`	`}`
`232`		`-`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`extension NSData: LCDeviceTokenConvertible {`
`236`	`237`
`237`	`238`	`public var lcDeviceToken: LCString {`
`238`	`239`	`return (self as Data).lcDeviceToken`
`239`	`240`	`}`
`240`		`-`
`241`	`241`	`}`