refactor: add external parameter name to merge

ParseSwift.playground/Pages/1 - Your first Object.xcplaygroundpage/Contents.swift

@@ -42,8 +42,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points
@@ -80,8 +80,8 @@ struct GameData: ParseObject {
     var bytes: ParseBytes?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if shouldRestoreKey(\.polygon,
                              original: object) {
             updated.polygon = object.polygon

ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift

@@ -112,8 +112,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/11 - LiveQuery.xcplaygroundpage/Contents.swift

@@ -24,8 +24,8 @@ struct GameScore: ParseObject {
     var name: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift

@@ -32,8 +32,8 @@ struct User: ParseUser {
     var customKey: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.customKey,
                                      original: object) {
             updated.customKey = object.customKey
@@ -55,8 +55,8 @@ struct Role<RoleUser: ParseUser>: ParseRole {
     var name: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.name,
                                      original: object) {
             updated.name = object.name
@@ -78,8 +78,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/13 - Operations.xcplaygroundpage/Contents.swift

@@ -26,8 +26,8 @@ struct GameScore: ParseObject {
     var name: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift

@@ -33,8 +33,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift

@@ -34,8 +34,8 @@ struct GameScore: ParseObject {
     var myFiles: [ParseFile]?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/18 - SwiftUI - Finding Objects With Custom ViewModel.xcplaygroundpage/Contents.swift

@@ -34,8 +34,8 @@ struct GameScore: ParseObject {
     var name: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/19 - SwiftUI - LiveQuery.xcplaygroundpage/Contents.swift

@@ -32,8 +32,8 @@ struct GameScore: ParseObject {
     var name: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/2 - Finding Objects.xcplaygroundpage/Contents.swift

@@ -27,8 +27,8 @@ struct GameScore: ParseObject {
     var isHighest: Bool?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift

@@ -32,8 +32,8 @@ struct User: ParseUser {
     var customKey: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.customKey,
                                      original: object) {
             updated.customKey = object.customKey

ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift

@@ -35,8 +35,8 @@ struct User: ParseUser {
     var allScores: [GameScore]?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.customKey,
                                      original: object) {
             updated.customKey = object.customKey
@@ -81,8 +81,8 @@ struct GameScore: ParseObject {
     var points: Int? = 0
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                          original: object) {
             updated.points = object.points
@@ -244,7 +244,7 @@ User.anonymous.login { result in
 }
 
 //: Convert the anonymous user to a real new user.
-var currentUser2 = User.current?.mergeable
+var currentUser2 = User.current
 currentUser2?.username = "bye"
 currentUser2?.password = "world"
 currentUser2?.signup { result in

ParseSwift.playground/Pages/5 - ACL.xcplaygroundpage/Contents.swift

@@ -35,8 +35,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/6 - Installation.xcplaygroundpage/Contents.swift

@@ -38,8 +38,8 @@ struct Installation: ParseInstallation {
     var customKey: String?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.customKey,
                                      original: object) {
             updated.customKey = object.customKey

ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift

@@ -27,8 +27,8 @@ struct GameScore: ParseObject {
     var points: Int?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

ParseSwift.playground/Pages/8 - Pointers.xcplaygroundpage/Contents.swift

@@ -28,8 +28,8 @@ struct Book: ParseObject, ParseQueryScorable {
     var relatedBook: Pointer<Book>?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.title,
                                      original: object) {
             updated.title = object.title
@@ -65,8 +65,8 @@ struct Author: ParseObject {
     var otherBooks: [Book]?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.name,
                                      original: object) {
             updated.name = object.name

ParseSwift.playground/Pages/9 - Files.xcplaygroundpage/Contents.swift

@@ -28,8 +28,8 @@ struct GameScore: ParseObject {
     var myData: ParseFile?
 
     //: Implement your own version of merge
-    func merge(_ object: Self) throws -> Self {
-        var updated = try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        var updated = try mergeParse(with: object)
         if updated.shouldRestoreKey(\.points,
                                      original: object) {
             updated.points = object.points

Sources/ParseSwift/API/API+Command.swift

@@ -431,7 +431,7 @@ internal extension API.Command {
                   original.hasSameObjectId(as: object) else {
                       return object
                   }
-            return try object.merge(original)
+            return try object.merge(with: original)
         }
         return API.Command<T, T>(method: .PUT,
                                  path: object.endpoint,
@@ -457,7 +457,7 @@ internal extension API.Command {
                   original.hasSameObjectId(as: object) else {
                       return object
                   }
-            return try object.merge(original)
+            return try object.merge(with: original)
         }
         return API.Command<T, T>(method: .PATCH,
                                  path: object.endpoint,

Sources/ParseSwift/Objects/ParseInstallation.swift

@@ -96,7 +96,7 @@ public extension ParseInstallation {
         "_Installation"
     }
 
-    func mergeParse(_ object: Self) throws -> Self {
+    func mergeParse(with object: Self) throws -> Self {
         guard hasSameObjectId(as: object) == true else {
             throw ParseError(code: .unknownError,
                              message: "objectId's of objects don't match")
@@ -153,8 +153,8 @@ public extension ParseInstallation {
         return updatedInstallation
     }
 
-    func merge(_ object: Self) throws -> Self {
-        try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        try mergeParse(with: object)
     }
 }
 
@@ -778,7 +778,7 @@ extension ParseInstallation {
                   original.hasSameObjectId(as: object) else {
                       return object
                   }
-            return try object.merge(original)
+            return try object.merge(with: original)
         }
         return API.Command<Self, Self>(method: .PUT,
                                  path: endpoint,
@@ -801,7 +801,7 @@ extension ParseInstallation {
                   original.hasSameObjectId(as: object) else {
                       return object
                   }
-            return try object.merge(original)
+            return try object.merge(with: original)
         }
         return API.Command<Self, Self>(method: .PATCH,
                                  path: endpoint,

Sources/ParseSwift/Objects/ParseObject.swift

@@ -77,15 +77,15 @@ public protocol ParseObject: Objectable,
     /**
      Merges two `ParseObject`'s with the resulting object consisting of all modified
      and unchanged Parse properties.
-     - parameter object: The original installation.
+     - parameter with: The original object.
      - returns: The updated installation.
      - throws: An error of type `ParseError`.
      - note: This is used in combination with `merge` to only send updated
      properties to the server and then merge those changes with the original object.
      - warning: You should only call this method and shouldn't implement it directly
      as it's already implemented for developers to use.
     */
-    func mergeParse(_ object: Self) throws -> Self
+    func mergeParse(with object: Self) throws -> Self
 
     /**
      Merges two `ParseObject`'s with the resulting object consisting of all modified
@@ -103,8 +103,8 @@ public protocol ParseObject: Objectable,
              var points: Int?
 
              //: Implement your own version of merge
-             func merge(_ object: Self) throws -> Self {
-                 var updated = try mergeParse(object)
+             func merge(with object: Self) throws -> Self {
+                 var updated = try mergeParse(with: object)
                  if updated.shouldRestoreKey(\.points,
                                                   original: object) {
                      updated.points = object.points
@@ -113,7 +113,7 @@ public protocol ParseObject: Objectable,
              }
          }
 
-     - parameter object: The original object.
+     - parameter with: The original object.
      - returns: The merged object.
      - throws: An error of type `ParseError`.
      - note: Use this in combination with `ParseMutable` to only send updated
@@ -124,7 +124,7 @@ public protocol ParseObject: Objectable,
      in the beginning of your implementation to handle all default Parse properties. In addition,
      use `shouldRestoreKey` to compare key modifications between objects.
     */
-    func merge(_ object: Self) throws -> Self
+    func merge(with object: Self) throws -> Self
 
     init()
 }
@@ -174,7 +174,7 @@ public extension ParseObject {
         self[keyPath: key] == nil && original[keyPath: key] != self[keyPath: key]
     }
 
-    func mergeParse(_ object: Self) throws -> Self {
+    func mergeParse(with object: Self) throws -> Self {
         guard hasSameObjectId(as: object) == true else {
             throw ParseError(code: .unknownError,
                              message: "objectId's of objects don't match")
@@ -187,8 +187,8 @@ public extension ParseObject {
         return updated
     }
 
-    func merge(_ object: Self) throws -> Self {
-        return try mergeParse(object)
+    func merge(with object: Self) throws -> Self {
+        return try mergeParse(with: object)
     }
 }