From 37a2247f0852371228cc8480b9801a8deb5fe130 Mon Sep 17 00:00:00 2001 From: Corey Date: Thu, 4 Nov 2021 11:51:54 -0400 Subject: [PATCH] fix: improve equatable comparison of QueryConstraint (#275) * fix: improve equatable comparison of QueryConstraint * nits --- CHANGELOG.md | 12 +- ParseSwift.xcodeproj/project.pbxproj | 122 ++++++++++-------- Sources/ParseSwift/Coding/Extensions.swift | 61 --------- Sources/ParseSwift/Coding/ParseCoding.swift | 42 ++++++ .../Data.swift} | 2 +- Sources/ParseSwift/Extensions/Date.swift | 20 +++ Sources/ParseSwift/Extensions/Encodable.swift | 21 +++ .../URLCache.swift} | 4 +- .../URLSession.swift} | 36 +++--- .../BaseConfig.swift | 2 +- .../BaseParseInstallation.swift | 0 .../BaseParseUser.swift | 0 .../NoBody.swift | 0 .../Protocols/QuerySubscribable.swift | 2 +- Sources/ParseSwift/Objects/ParseSession.swift | 1 - Sources/ParseSwift/ParseConstants.swift | 2 +- .../ParseOperation+async.swift | 0 .../ParseOperation+combine.swift | 0 .../ParseOperation.swift | 16 +-- Sources/ParseSwift/Types/ParseRelation.swift | 3 + Sources/ParseSwift/Types/Query.swift | 6 +- 21 files changed, 194 insertions(+), 158 deletions(-) delete mode 100644 Sources/ParseSwift/Coding/Extensions.swift rename Sources/ParseSwift/{Internal/Data+hexString.swift => Extensions/Data.swift} (98%) create mode 100644 Sources/ParseSwift/Extensions/Date.swift create mode 100644 Sources/ParseSwift/Extensions/Encodable.swift rename Sources/ParseSwift/{API/URLCache+extensions.swift => Extensions/URLCache.swift} (97%) rename Sources/ParseSwift/{API/URLSession+extensions.swift => Extensions/URLSession.swift} (90%) rename Sources/ParseSwift/{Internal => InternalObjects}/BaseConfig.swift (82%) rename Sources/ParseSwift/{Internal => InternalObjects}/BaseParseInstallation.swift (100%) rename Sources/ParseSwift/{Internal => InternalObjects}/BaseParseUser.swift (100%) rename Sources/ParseSwift/{Internal => InternalObjects}/NoBody.swift (100%) rename Sources/ParseSwift/{Operations => Types}/ParseOperation+async.swift (100%) rename Sources/ParseSwift/{Operations => Types}/ParseOperation+combine.swift (100%) rename Sources/ParseSwift/{Operations => Types}/ParseOperation.swift (96%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 433c03aa9..f55922198 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,20 @@ ### main -[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.2.1...main) +[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.2.2...main) * _Contributing to this repo? Add info about your change here to be included in the next release_ +### 2.2.2 +[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.2.1...2.2.2) + +__Fixes__ +- Improve equatable comparison of QueryConstraint ([#275](https://github.com/parse-community/Parse-Swift/pull/275)), thanks to [Corey Baker](https://github.com/cbaker6). + ### 2.2.1 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.2.0...2.2.1) __Fixes__ -- Set the default cache policy for `ParseFile` to the default policy set when initializing the SDK ([#274](https://github.com/parse-community/Parse-Swift/pull/274)), thanks to [Corey Baker](https://github.com/cbaker6). +- Set the default cache policy for ParseFile to the default policy set when initializing the SDK ([#274](https://github.com/parse-community/Parse-Swift/pull/274)), thanks to [Corey Baker](https://github.com/cbaker6). ### 2.2.0 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.1.0...2.2.0) @@ -18,7 +24,7 @@ __Improvements__ - Added ability to fetch ParsePointer using async/await ([#271](https://github.com/parse-community/Parse-Swift/pull/271)), thanks to [Corey Baker](https://github.com/cbaker6). __Fixes__ -- By default, don't use cache when fetching ParseObject's and `ParseFile`s. Developers can choose to fetch from cache if desired by passing the necessary option while fetching. Fixed a bug when the incorrect file location for a dowloaded ParseFile was being cached ([#272](https://github.com/parse-community/Parse-Swift/pull/272)), thanks to [Corey Baker](https://github.com/cbaker6). +- By default, don't use cache when fetching ParseObject's and ParseFile's. Developers can choose to fetch from cache if desired by passing the necessary option while fetching. Fixed a bug when the incorrect file location for a dowloaded ParseFile was being cached ([#272](https://github.com/parse-community/Parse-Swift/pull/272)), thanks to [Corey Baker](https://github.com/cbaker6). ### 2.1.0 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/2.0.3...2.1.0) diff --git a/ParseSwift.xcodeproj/project.pbxproj b/ParseSwift.xcodeproj/project.pbxproj index 5db1dc85b..fbf72e378 100644 --- a/ParseSwift.xcodeproj/project.pbxproj +++ b/ParseSwift.xcodeproj/project.pbxproj @@ -117,10 +117,10 @@ 7037DAB226384DE1005D7E62 /* TestParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7037DAB126384DE1005D7E62 /* TestParseEncoder.swift */; }; 7037DAB326384DE1005D7E62 /* TestParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7037DAB126384DE1005D7E62 /* TestParseEncoder.swift */; }; 7037DAB426384DE1005D7E62 /* TestParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7037DAB126384DE1005D7E62 /* TestParseEncoder.swift */; }; - 70386A0625D9718C0048EC1B /* Data+hexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data+hexString.swift */; }; - 70386A0725D9718C0048EC1B /* Data+hexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data+hexString.swift */; }; - 70386A0825D9718C0048EC1B /* Data+hexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data+hexString.swift */; }; - 70386A0925D9718C0048EC1B /* Data+hexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data+hexString.swift */; }; + 70386A0625D9718C0048EC1B /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data.swift */; }; + 70386A0725D9718C0048EC1B /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data.swift */; }; + 70386A0825D9718C0048EC1B /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data.swift */; }; + 70386A0925D9718C0048EC1B /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A0525D9718C0048EC1B /* Data.swift */; }; 70386A3825D998D90048EC1B /* ParseLDAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A3725D998D90048EC1B /* ParseLDAP.swift */; }; 70386A3925D998D90048EC1B /* ParseLDAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A3725D998D90048EC1B /* ParseLDAP.swift */; }; 70386A3A25D998D90048EC1B /* ParseLDAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70386A3725D998D90048EC1B /* ParseLDAP.swift */; }; @@ -297,6 +297,14 @@ 7064369C273313D5007C6461 /* LiveQueryConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7064369A273313D5007C6461 /* LiveQueryConstants.swift */; }; 7064369D273313D5007C6461 /* LiveQueryConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7064369A273313D5007C6461 /* LiveQueryConstants.swift */; }; 7064369E273313D5007C6461 /* LiveQueryConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7064369A273313D5007C6461 /* LiveQueryConstants.swift */; }; + 706436A427341F6E007C6461 /* Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A327341F6E007C6461 /* Encodable.swift */; }; + 706436A527341F6E007C6461 /* Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A327341F6E007C6461 /* Encodable.swift */; }; + 706436A627341F6E007C6461 /* Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A327341F6E007C6461 /* Encodable.swift */; }; + 706436A727341F6E007C6461 /* Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A327341F6E007C6461 /* Encodable.swift */; }; + 706436A927341FD0007C6461 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A827341FD0007C6461 /* Date.swift */; }; + 706436AA27341FD0007C6461 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A827341FD0007C6461 /* Date.swift */; }; + 706436AB27341FD0007C6461 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A827341FD0007C6461 /* Date.swift */; }; + 706436AC27341FD0007C6461 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 706436A827341FD0007C6461 /* Date.swift */; }; 70647E9C259E3A9A004C1004 /* ParseType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70647E9B259E3A9A004C1004 /* ParseType.swift */; }; 70647E9D259E3A9A004C1004 /* ParseType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70647E9B259E3A9A004C1004 /* ParseType.swift */; }; 70647E9E259E3A9A004C1004 /* ParseType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70647E9B259E3A9A004C1004 /* ParseType.swift */; }; @@ -476,10 +484,10 @@ 89899DB526045DC4002E2043 /* ParseFacebookCombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89899DB426045DC4002E2043 /* ParseFacebookCombineTests.swift */; }; 89899DB626045DC4002E2043 /* ParseFacebookCombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89899DB426045DC4002E2043 /* ParseFacebookCombineTests.swift */; }; 89899DB726045DC4002E2043 /* ParseFacebookCombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89899DB426045DC4002E2043 /* ParseFacebookCombineTests.swift */; }; - 9116F66F26A35D610082F6D6 /* URLCache+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */; }; - 9116F67026A35D610082F6D6 /* URLCache+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */; }; - 9116F67126A35D620082F6D6 /* URLCache+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */; }; - 9116F67226A35D620082F6D6 /* URLCache+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */; }; + 9116F66F26A35D610082F6D6 /* URLCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache.swift */; }; + 9116F67026A35D610082F6D6 /* URLCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache.swift */; }; + 9116F67126A35D620082F6D6 /* URLCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache.swift */; }; + 9116F67226A35D620082F6D6 /* URLCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9116F66E26A35D600082F6D6 /* URLCache.swift */; }; 911DB12C24C3F7720027F3C7 /* MockURLResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 911DB12B24C3F7720027F3C7 /* MockURLResponse.swift */; }; 911DB12E24C4837E0027F3C7 /* APICommandTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 911DB12D24C4837E0027F3C7 /* APICommandTests.swift */; }; 911DB13324C494390027F3C7 /* MockURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 911DB13224C494390027F3C7 /* MockURLProtocol.swift */; }; @@ -619,10 +627,6 @@ F97B45D724D9C6F200F4A88B /* ParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B624D9C6F200F4A88B /* ParseEncoder.swift */; }; F97B45D824D9C6F200F4A88B /* ParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B624D9C6F200F4A88B /* ParseEncoder.swift */; }; F97B45D924D9C6F200F4A88B /* ParseEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B624D9C6F200F4A88B /* ParseEncoder.swift */; }; - F97B45DA24D9C6F200F4A88B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B724D9C6F200F4A88B /* Extensions.swift */; }; - F97B45DB24D9C6F200F4A88B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B724D9C6F200F4A88B /* Extensions.swift */; }; - F97B45DC24D9C6F200F4A88B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B724D9C6F200F4A88B /* Extensions.swift */; }; - F97B45DD24D9C6F200F4A88B /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B724D9C6F200F4A88B /* Extensions.swift */; }; F97B45DE24D9C6F200F4A88B /* AnyCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B824D9C6F200F4A88B /* AnyCodable.swift */; }; F97B45DF24D9C6F200F4A88B /* AnyCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B824D9C6F200F4A88B /* AnyCodable.swift */; }; F97B45E024D9C6F200F4A88B /* AnyCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B45B824D9C6F200F4A88B /* AnyCodable.swift */; }; @@ -699,10 +703,10 @@ F97B463024D9C74400F4A88B /* BatchUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462B24D9C74400F4A88B /* BatchUtils.swift */; }; F97B463124D9C74400F4A88B /* BatchUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462B24D9C74400F4A88B /* BatchUtils.swift */; }; F97B463224D9C74400F4A88B /* BatchUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462B24D9C74400F4A88B /* BatchUtils.swift */; }; - F97B463324D9C74400F4A88B /* URLSession+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */; }; - F97B463424D9C74400F4A88B /* URLSession+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */; }; - F97B463524D9C74400F4A88B /* URLSession+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */; }; - F97B463624D9C74400F4A88B /* URLSession+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */; }; + F97B463324D9C74400F4A88B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession.swift */; }; + F97B463424D9C74400F4A88B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession.swift */; }; + F97B463524D9C74400F4A88B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession.swift */; }; + F97B463624D9C74400F4A88B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462C24D9C74400F4A88B /* URLSession.swift */; }; F97B463724D9C74400F4A88B /* Responses.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462D24D9C74400F4A88B /* Responses.swift */; }; F97B463824D9C74400F4A88B /* Responses.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462D24D9C74400F4A88B /* Responses.swift */; }; F97B463924D9C74400F4A88B /* Responses.swift in Sources */ = {isa = PBXBuildFile; fileRef = F97B462D24D9C74400F4A88B /* Responses.swift */; }; @@ -834,7 +838,7 @@ 7033ECBC25584A85009770F3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 7033ECBE25584A85009770F3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7037DAB126384DE1005D7E62 /* TestParseEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestParseEncoder.swift; sourceTree = ""; }; - 70386A0525D9718C0048EC1B /* Data+hexString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+hexString.swift"; sourceTree = ""; }; + 70386A0525D9718C0048EC1B /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = ""; }; 70386A3725D998D90048EC1B /* ParseLDAP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseLDAP.swift; sourceTree = ""; }; 70386A4525D99C8B0048EC1B /* ParseLDAPTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseLDAPTests.swift; sourceTree = ""; }; 70386A5B25D9A4010048EC1B /* ParseLDAPCombineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseLDAPCombineTests.swift; sourceTree = ""; }; @@ -883,6 +887,8 @@ 705A9A2E25991C1400B3547F /* Fileable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fileable.swift; sourceTree = ""; }; 705D950725BE4C08003EF6F8 /* SubscriptionCallback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionCallback.swift; sourceTree = ""; }; 7064369A273313D5007C6461 /* LiveQueryConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveQueryConstants.swift; sourceTree = ""; }; + 706436A327341F6E007C6461 /* Encodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = ""; }; + 706436A827341FD0007C6461 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = ""; }; 70647E9B259E3A9A004C1004 /* ParseType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseType.swift; sourceTree = ""; }; 70732C592606CCAD000CAB81 /* ParseObjectCustomObjectIdTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseObjectCustomObjectIdTests.swift; sourceTree = ""; }; 707A3BF025B0A4F0000D215C /* ParseAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseAuthentication.swift; sourceTree = ""; }; @@ -937,7 +943,7 @@ 89899CF32603CE9D002E2043 /* ParseFacebookTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseFacebookTests.swift; sourceTree = ""; }; 89899D9E26045998002E2043 /* ParseTwitterCombineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseTwitterCombineTests.swift; sourceTree = ""; }; 89899DB426045DC4002E2043 /* ParseFacebookCombineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParseFacebookCombineTests.swift; sourceTree = ""; }; - 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLCache+extensions.swift"; sourceTree = ""; }; + 9116F66E26A35D600082F6D6 /* URLCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLCache.swift; sourceTree = ""; }; 911DB12B24C3F7720027F3C7 /* MockURLResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLResponse.swift; sourceTree = ""; }; 911DB12D24C4837E0027F3C7 /* APICommandTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APICommandTests.swift; sourceTree = ""; }; 911DB13224C494390027F3C7 /* MockURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLProtocol.swift; sourceTree = ""; }; @@ -989,7 +995,6 @@ F97B45B424D9C6F200F4A88B /* ParseCoding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseCoding.swift; sourceTree = ""; }; F97B45B524D9C6F200F4A88B /* AnyDecodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyDecodable.swift; sourceTree = ""; }; F97B45B624D9C6F200F4A88B /* ParseEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseEncoder.swift; sourceTree = ""; }; - F97B45B724D9C6F200F4A88B /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; F97B45B824D9C6F200F4A88B /* AnyCodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyCodable.swift; sourceTree = ""; }; F97B45B924D9C6F200F4A88B /* AnyEncodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyEncodable.swift; sourceTree = ""; }; F97B45BB24D9C6F200F4A88B /* Query.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Query.swift; sourceTree = ""; }; @@ -1009,7 +1014,7 @@ F97B45CD24D9C6F200F4A88B /* ParseKeyValueStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseKeyValueStore.swift; sourceTree = ""; }; F97B462624D9C72700F4A88B /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = ""; }; F97B462B24D9C74400F4A88B /* BatchUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatchUtils.swift; sourceTree = ""; }; - F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLSession+extensions.swift"; sourceTree = ""; }; + F97B462C24D9C74400F4A88B /* URLSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSession.swift; sourceTree = ""; }; F97B462D24D9C74400F4A88B /* Responses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Responses.swift; sourceTree = ""; }; F97B462E24D9C74400F4A88B /* API+Command.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "API+Command.swift"; sourceTree = ""; }; F97B464024D9C78B00F4A88B /* ParseOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseOperation.swift; sourceTree = ""; }; @@ -1260,7 +1265,8 @@ F97B45C924D9C6F200F4A88B /* API */, 707A3BEF25B0A3B8000D215C /* Authentication */, F97B45B324D9C6F200F4A88B /* Coding */, - 70110D5D250849B30091CC1D /* Internal */, + 706436A227341F36007C6461 /* Extensions */, + 70110D5D250849B30091CC1D /* InternalObjects */, 70510AAA259EE23700FEA700 /* LiveQuery */, F97B45C324D9C6F200F4A88B /* Objects */, F97B463F24D9C78B00F4A88B /* Operations */, @@ -1290,31 +1296,30 @@ path = Protocols; sourceTree = ""; }; - 70110D5D250849B30091CC1D /* Internal */ = { + 70110D5D250849B30091CC1D /* InternalObjects */ = { isa = PBXGroup; children = ( - F97B45BD24D9C6F200F4A88B /* BaseParseUser.swift */, + 70D1BE7225BB43EB00A42E7C /* BaseConfig.swift */, 70110D562506CE890091CC1D /* BaseParseInstallation.swift */, + F97B45BD24D9C6F200F4A88B /* BaseParseUser.swift */, F97B45C224D9C6F200F4A88B /* NoBody.swift */, - 70D1BE7225BB43EB00A42E7C /* BaseConfig.swift */, - 70386A0525D9718C0048EC1B /* Data+hexString.swift */, ); - path = Internal; + path = InternalObjects; sourceTree = ""; }; 70110D5E25084AF80091CC1D /* Protocols */ = { isa = PBXGroup; children = ( + 91F346BD269B77B5005727B6 /* CloudObservable.swift */, 708D035125215F9B00646C70 /* Deletable.swift */, F97B45C524D9C6F200F4A88B /* Fetchable.swift */, 705A9A2E25991C1400B3547F /* Fileable.swift */, 70BC988F252A5B5C00FF3074 /* Objectable.swift */, - F97B45C824D9C6F200F4A88B /* Queryable.swift */, - F97B45C724D9C6F200F4A88B /* Savable.swift */, - 70647E9B259E3A9A004C1004 /* ParseType.swift */, CD1069FF272D481800939151 /* ParseObjectMutable.swift */, + 70647E9B259E3A9A004C1004 /* ParseType.swift */, + F97B45C824D9C6F200F4A88B /* Queryable.swift */, 91BB8FCE2690BA70005A6BA5 /* QueryObservable.swift */, - 91F346BD269B77B5005727B6 /* CloudObservable.swift */, + F97B45C724D9C6F200F4A88B /* Savable.swift */, ); path = Protocols; sourceTree = ""; @@ -1399,6 +1404,18 @@ path = LiveQuery; sourceTree = ""; }; + 706436A227341F36007C6461 /* Extensions */ = { + isa = PBXGroup; + children = ( + F97B462C24D9C74400F4A88B /* URLSession.swift */, + 9116F66E26A35D600082F6D6 /* URLCache.swift */, + 706436A327341F6E007C6461 /* Encodable.swift */, + 70386A0525D9718C0048EC1B /* Data.swift */, + 706436A827341FD0007C6461 /* Date.swift */, + ); + path = Extensions; + sourceTree = ""; + }; 707A3BEF25B0A3B8000D215C /* Authentication */ = { isa = PBXGroup; children = ( @@ -1507,7 +1524,6 @@ F97B45B824D9C6F200F4A88B /* AnyCodable.swift */, F97B45B524D9C6F200F4A88B /* AnyDecodable.swift */, F97B45B924D9C6F200F4A88B /* AnyEncodable.swift */, - F97B45B724D9C6F200F4A88B /* Extensions.swift */, F97B45B424D9C6F200F4A88B /* ParseCoding.swift */, F97B45B624D9C6F200F4A88B /* ParseEncoder.swift */, ); @@ -1537,6 +1553,9 @@ 70F79A182639CE6F00731C46 /* ParseHealth.swift */, 703B08FC26BD953B005A112F /* ParseHealth+async.swift */, 7085DDA226CC8A470033B977 /* ParseHealth+combine.swift */, + F97B464024D9C78B00F4A88B /* ParseOperation.swift */, + 703B091026BD992E005A112F /* ParseOperation+async.swift */, + 7044C19E25C4FA870011F6E7 /* ParseOperation+combine.swift */, 91285B1B26990D7F0051B544 /* ParsePolygon.swift */, 7004C21F25B63C7A005E0AD9 /* ParseRelation.swift */, 91679D63268E596300F71809 /* ParseVersion.swift */, @@ -1579,8 +1598,6 @@ F97B462B24D9C74400F4A88B /* BatchUtils.swift */, 7003972925A3B0130052CB31 /* ParseURLSessionDelegate.swift */, F97B462D24D9C74400F4A88B /* Responses.swift */, - 9116F66E26A35D600082F6D6 /* URLCache+extensions.swift */, - F97B462C24D9C74400F4A88B /* URLSession+extensions.swift */, ); path = API; sourceTree = ""; @@ -1605,9 +1622,6 @@ F97B464324D9C78B00F4A88B /* AddUnique.swift */, F97B464124D9C78B00F4A88B /* Delete.swift */, F97B464524D9C78B00F4A88B /* Increment.swift */, - F97B464024D9C78B00F4A88B /* ParseOperation.swift */, - 703B091026BD992E005A112F /* ParseOperation+async.swift */, - 7044C19E25C4FA870011F6E7 /* ParseOperation+combine.swift */, F97B464424D9C78B00F4A88B /* Remove.swift */, 70C5509F25B4A9F600B5DBC2 /* RemoveRelation.swift */, ); @@ -2052,7 +2066,6 @@ 916786E2259B7DDA00BB5B4E /* ParseCloud.swift in Sources */, 91F346B9269B766C005727B6 /* CloudViewModel.swift in Sources */, F97B461624D9C6F200F4A88B /* Queryable.swift in Sources */, - F97B45DA24D9C6F200F4A88B /* Extensions.swift in Sources */, 7028373426BD8883007688C9 /* ParseObject+async.swift in Sources */, 70C5503825B406B800B5DBC2 /* ParseSession.swift in Sources */, 7044C1C825C5B2B10011F6E7 /* ParseAuthentication+combine.swift in Sources */, @@ -2060,7 +2073,7 @@ 70D1BE7325BB43EB00A42E7C /* BaseConfig.swift in Sources */, 703B090726BD9764005A112F /* ParseCloud+async.swift in Sources */, 918CED592684C74000CFDC83 /* ParseLiveQuery+combine.swift in Sources */, - 70386A0625D9718C0048EC1B /* Data+hexString.swift in Sources */, + 70386A0625D9718C0048EC1B /* Data.swift in Sources */, F97B465F24D9C7B500F4A88B /* KeychainStore.swift in Sources */, 70170A442656B02D0070C905 /* ParseAnalytics.swift in Sources */, 70110D52250680140091CC1D /* ParseConstants.swift in Sources */, @@ -2108,7 +2121,7 @@ 7044C17525C4ECFF0011F6E7 /* ParseCloud+combine.swift in Sources */, F97B45E224D9C6F200F4A88B /* AnyEncodable.swift in Sources */, 700396EA25A3892D0052CB31 /* LiveQuerySocketDelegate.swift in Sources */, - 9116F66F26A35D610082F6D6 /* URLCache+extensions.swift in Sources */, + 9116F66F26A35D610082F6D6 /* URLCache.swift in Sources */, 70572671259033A700F0ADD5 /* ParseFileManager.swift in Sources */, 707A3C2025B14BD0000D215C /* ParseApple.swift in Sources */, 703B095D26BF481F005A112F /* ParseFacebook+async.swift in Sources */, @@ -2132,6 +2145,7 @@ F97B45EA24D9C6F200F4A88B /* ParseGeoPoint.swift in Sources */, F97B460224D9C6F200F4A88B /* NoBody.swift in Sources */, 703B093026BF42C2005A112F /* ParseAnonymous+combine.swift in Sources */, + 706436A927341FD0007C6461 /* Date.swift in Sources */, 700395BA25A1470F0052CB31 /* Subscription.swift in Sources */, 91285B132698DBF20051B544 /* ParseBytes.swift in Sources */, 7016ED5625C4C32B00038648 /* ParseInstallation+combine.swift in Sources */, @@ -2142,12 +2156,13 @@ 703B092B26BF290B005A112F /* ParseAuthentication+async.swift in Sources */, F97B45F624D9C6F200F4A88B /* ParseError.swift in Sources */, 7045769D26BD934000F86F71 /* ParseFile+async.swift in Sources */, - F97B463324D9C74400F4A88B /* URLSession+extensions.swift in Sources */, + F97B463324D9C74400F4A88B /* URLSession.swift in Sources */, F97B464E24D9C78B00F4A88B /* Add.swift in Sources */, 703B095326BF47FD005A112F /* ParseTwitter+async.swift in Sources */, 70BC9890252A5B5C00FF3074 /* Objectable.swift in Sources */, F97B45FE24D9C6F200F4A88B /* ParseFile.swift in Sources */, F97B45EE24D9C6F200F4A88B /* BaseParseUser.swift in Sources */, + 706436A427341F6E007C6461 /* Encodable.swift in Sources */, F97B460A24D9C6F200F4A88B /* Fetchable.swift in Sources */, 703B090C26BD984D005A112F /* ParseConfig+async.swift in Sources */, F97B460E24D9C6F200F4A88B /* ParseObject.swift in Sources */, @@ -2266,7 +2281,6 @@ 916786E3259B7DDA00BB5B4E /* ParseCloud.swift in Sources */, 91F346BA269B766D005727B6 /* CloudViewModel.swift in Sources */, F97B461724D9C6F200F4A88B /* Queryable.swift in Sources */, - F97B45DB24D9C6F200F4A88B /* Extensions.swift in Sources */, 7028373526BD8883007688C9 /* ParseObject+async.swift in Sources */, 70C5503925B406B800B5DBC2 /* ParseSession.swift in Sources */, 7044C1C925C5B2B10011F6E7 /* ParseAuthentication+combine.swift in Sources */, @@ -2274,7 +2288,7 @@ 70D1BE7425BB43EB00A42E7C /* BaseConfig.swift in Sources */, 703B090826BD9764005A112F /* ParseCloud+async.swift in Sources */, 918CED5A2684C74000CFDC83 /* ParseLiveQuery+combine.swift in Sources */, - 70386A0725D9718C0048EC1B /* Data+hexString.swift in Sources */, + 70386A0725D9718C0048EC1B /* Data.swift in Sources */, F97B466024D9C7B500F4A88B /* KeychainStore.swift in Sources */, 70170A452656B02D0070C905 /* ParseAnalytics.swift in Sources */, 70110D53250680140091CC1D /* ParseConstants.swift in Sources */, @@ -2322,7 +2336,7 @@ 7044C17625C4ECFF0011F6E7 /* ParseCloud+combine.swift in Sources */, F97B45E324D9C6F200F4A88B /* AnyEncodable.swift in Sources */, 700396EB25A3892D0052CB31 /* LiveQuerySocketDelegate.swift in Sources */, - 9116F67026A35D610082F6D6 /* URLCache+extensions.swift in Sources */, + 9116F67026A35D610082F6D6 /* URLCache.swift in Sources */, 70572672259033A700F0ADD5 /* ParseFileManager.swift in Sources */, 707A3C2125B14BD0000D215C /* ParseApple.swift in Sources */, 703B095E26BF481F005A112F /* ParseFacebook+async.swift in Sources */, @@ -2346,6 +2360,7 @@ F97B45EB24D9C6F200F4A88B /* ParseGeoPoint.swift in Sources */, F97B460324D9C6F200F4A88B /* NoBody.swift in Sources */, 703B093126BF42C2005A112F /* ParseAnonymous+combine.swift in Sources */, + 706436AA27341FD0007C6461 /* Date.swift in Sources */, 700395BB25A1470F0052CB31 /* Subscription.swift in Sources */, 91285B142698DBF20051B544 /* ParseBytes.swift in Sources */, 7016ED5725C4C32B00038648 /* ParseInstallation+combine.swift in Sources */, @@ -2356,12 +2371,13 @@ 703B092C26BF290B005A112F /* ParseAuthentication+async.swift in Sources */, F97B45F724D9C6F200F4A88B /* ParseError.swift in Sources */, 7045769E26BD934000F86F71 /* ParseFile+async.swift in Sources */, - F97B463424D9C74400F4A88B /* URLSession+extensions.swift in Sources */, + F97B463424D9C74400F4A88B /* URLSession.swift in Sources */, F97B464F24D9C78B00F4A88B /* Add.swift in Sources */, 703B095426BF47FD005A112F /* ParseTwitter+async.swift in Sources */, 70BC9891252A5B5C00FF3074 /* Objectable.swift in Sources */, F97B45FF24D9C6F200F4A88B /* ParseFile.swift in Sources */, F97B45EF24D9C6F200F4A88B /* BaseParseUser.swift in Sources */, + 706436A527341F6E007C6461 /* Encodable.swift in Sources */, F97B460B24D9C6F200F4A88B /* Fetchable.swift in Sources */, 703B090D26BD984D005A112F /* ParseConfig+async.swift in Sources */, F97B460F24D9C6F200F4A88B /* ParseObject.swift in Sources */, @@ -2576,7 +2592,7 @@ 916786E5259B7DDA00BB5B4E /* ParseCloud.swift in Sources */, 91F346BC269B766D005727B6 /* CloudViewModel.swift in Sources */, F97B45E924D9C6F200F4A88B /* Query.swift in Sources */, - F97B463624D9C74400F4A88B /* URLSession+extensions.swift in Sources */, + F97B463624D9C74400F4A88B /* URLSession.swift in Sources */, 7028373726BD8883007688C9 /* ParseObject+async.swift in Sources */, 70C5503B25B406B800B5DBC2 /* ParseSession.swift in Sources */, 7044C1CB25C5B2B10011F6E7 /* ParseAuthentication+combine.swift in Sources */, @@ -2584,7 +2600,7 @@ 70D1BE7625BB43EB00A42E7C /* BaseConfig.swift in Sources */, 703B090A26BD9764005A112F /* ParseCloud+async.swift in Sources */, 918CED5C2684C74000CFDC83 /* ParseLiveQuery+combine.swift in Sources */, - 70386A0925D9718C0048EC1B /* Data+hexString.swift in Sources */, + 70386A0925D9718C0048EC1B /* Data.swift in Sources */, F97B460524D9C6F200F4A88B /* NoBody.swift in Sources */, 70170A472656B02D0070C905 /* ParseAnalytics.swift in Sources */, F97B45E124D9C6F200F4A88B /* AnyCodable.swift in Sources */, @@ -2630,9 +2646,8 @@ 7045769626BD8F8100F86F71 /* ParseInstallation+async.swift in Sources */, 7003960C25A184EF0052CB31 /* ParseLiveQuery.swift in Sources */, 7044C17825C4ECFF0011F6E7 /* ParseCloud+combine.swift in Sources */, - F97B45DD24D9C6F200F4A88B /* Extensions.swift in Sources */, 700396ED25A3892D0052CB31 /* LiveQuerySocketDelegate.swift in Sources */, - 9116F67226A35D620082F6D6 /* URLCache+extensions.swift in Sources */, + 9116F67226A35D620082F6D6 /* URLCache.swift in Sources */, 70572674259033A700F0ADD5 /* ParseFileManager.swift in Sources */, 707A3C2325B14BD0000D215C /* ParseApple.swift in Sources */, 703B096026BF481F005A112F /* ParseFacebook+async.swift in Sources */, @@ -2656,6 +2671,7 @@ 70110D5A2506CE890091CC1D /* BaseParseInstallation.swift in Sources */, F97B45F924D9C6F200F4A88B /* ParseError.swift in Sources */, 703B093326BF42C2005A112F /* ParseAnonymous+combine.swift in Sources */, + 706436AC27341FD0007C6461 /* Date.swift in Sources */, 700395BD25A1470F0052CB31 /* Subscription.swift in Sources */, 91285B162698DBF20051B544 /* ParseBytes.swift in Sources */, 7016ED5925C4C32B00038648 /* ParseInstallation+combine.swift in Sources */, @@ -2672,6 +2688,7 @@ 70BC9893252A5B5C00FF3074 /* Objectable.swift in Sources */, F97B465524D9C78C00F4A88B /* AddUnique.swift in Sources */, F97B464D24D9C78B00F4A88B /* Delete.swift in Sources */, + 706436A727341F6E007C6461 /* Encodable.swift in Sources */, F97B461524D9C6F200F4A88B /* Savable.swift in Sources */, 703B090F26BD984D005A112F /* ParseConfig+async.swift in Sources */, F97B462524D9C6F200F4A88B /* ParseKeyValueStore.swift in Sources */, @@ -2703,7 +2720,7 @@ 916786E4259B7DDA00BB5B4E /* ParseCloud.swift in Sources */, 91F346BB269B766D005727B6 /* CloudViewModel.swift in Sources */, F97B45E824D9C6F200F4A88B /* Query.swift in Sources */, - F97B463524D9C74400F4A88B /* URLSession+extensions.swift in Sources */, + F97B463524D9C74400F4A88B /* URLSession.swift in Sources */, 7028373626BD8883007688C9 /* ParseObject+async.swift in Sources */, 70C5503A25B406B800B5DBC2 /* ParseSession.swift in Sources */, 7044C1CA25C5B2B10011F6E7 /* ParseAuthentication+combine.swift in Sources */, @@ -2711,7 +2728,7 @@ 70D1BE7525BB43EB00A42E7C /* BaseConfig.swift in Sources */, 703B090926BD9764005A112F /* ParseCloud+async.swift in Sources */, 918CED5B2684C74000CFDC83 /* ParseLiveQuery+combine.swift in Sources */, - 70386A0825D9718C0048EC1B /* Data+hexString.swift in Sources */, + 70386A0825D9718C0048EC1B /* Data.swift in Sources */, F97B460424D9C6F200F4A88B /* NoBody.swift in Sources */, 70170A462656B02D0070C905 /* ParseAnalytics.swift in Sources */, F97B45E024D9C6F200F4A88B /* AnyCodable.swift in Sources */, @@ -2757,9 +2774,8 @@ 7045769526BD8F8100F86F71 /* ParseInstallation+async.swift in Sources */, 7003960B25A184EF0052CB31 /* ParseLiveQuery.swift in Sources */, 7044C17725C4ECFF0011F6E7 /* ParseCloud+combine.swift in Sources */, - F97B45DC24D9C6F200F4A88B /* Extensions.swift in Sources */, 700396EC25A3892D0052CB31 /* LiveQuerySocketDelegate.swift in Sources */, - 9116F67126A35D620082F6D6 /* URLCache+extensions.swift in Sources */, + 9116F67126A35D620082F6D6 /* URLCache.swift in Sources */, 70572673259033A700F0ADD5 /* ParseFileManager.swift in Sources */, 707A3C2225B14BD0000D215C /* ParseApple.swift in Sources */, 703B095F26BF481F005A112F /* ParseFacebook+async.swift in Sources */, @@ -2783,6 +2799,7 @@ 70110D592506CE890091CC1D /* BaseParseInstallation.swift in Sources */, F97B45F824D9C6F200F4A88B /* ParseError.swift in Sources */, 703B093226BF42C2005A112F /* ParseAnonymous+combine.swift in Sources */, + 706436AB27341FD0007C6461 /* Date.swift in Sources */, 700395BC25A1470F0052CB31 /* Subscription.swift in Sources */, 91285B152698DBF20051B544 /* ParseBytes.swift in Sources */, 7016ED5825C4C32B00038648 /* ParseInstallation+combine.swift in Sources */, @@ -2799,6 +2816,7 @@ 70BC9892252A5B5C00FF3074 /* Objectable.swift in Sources */, F97B465424D9C78C00F4A88B /* AddUnique.swift in Sources */, F97B464C24D9C78B00F4A88B /* Delete.swift in Sources */, + 706436A627341F6E007C6461 /* Encodable.swift in Sources */, F97B461424D9C6F200F4A88B /* Savable.swift in Sources */, 703B090E26BD984D005A112F /* ParseConfig+async.swift in Sources */, F97B462424D9C6F200F4A88B /* ParseKeyValueStore.swift in Sources */, diff --git a/Sources/ParseSwift/Coding/Extensions.swift b/Sources/ParseSwift/Coding/Extensions.swift deleted file mode 100644 index 0c32fa88e..000000000 --- a/Sources/ParseSwift/Coding/Extensions.swift +++ /dev/null @@ -1,61 +0,0 @@ -// -// Extensions.swift -// -// -// Created by Pranjal Satija on 7/19/20. -// - -import Foundation - -// MARK: Date -internal extension Date { - func parseFormatted() -> String { - return ParseCoding.dateFormatter.string(from: self) - } - - var parseRepresentation: [String: String] { - return ["__type": "Date", "iso": parseFormatted()] - } -} - -// MARK: Coding -public extension ParseObject { - - /// The Parse encoder is used to JSON encode all `ParseObject`s and - /// types in a way meaninful for a Parse Server to consume. - static func getEncoder() -> ParseEncoder { - return ParseCoding.parseEncoder() - } - - /// The Parse encoder is used to JSON encode all `ParseObject`s and - /// types in a way meaninful for a Parse Server to consume. - func getEncoder() -> ParseEncoder { - return Self.getEncoder() - } - - /// The JSON encoder setup with the correct `dateEncodingStrategy` - /// strategy to send data to a Parse Server. - static func getJSONEncoder() -> JSONEncoder { - return ParseCoding.jsonEncoder() - } - - /// The JSON encoder setup with the correct `dateEncodingStrategy` - /// strategy to send data to a Parse Server. - func getJSONEncoder() -> JSONEncoder { - return Self.getJSONEncoder() - } - - /// The JSON decoder setup with the correct `dateDecodingStrategy` - /// strategy to decode data from a Parse Server. This encoder is used to decode all data received - /// from the server. - static func getDecoder() -> JSONDecoder { - ParseCoding.jsonDecoder() - } - - /// The JSON decoder setup with the correct `dateDecodingStrategy` - /// strategy to decode data from a Parse Server. This encoder is used to decode all data received - /// from the server. - func getDecoder() -> JSONDecoder { - Self.getDecoder() - } -} diff --git a/Sources/ParseSwift/Coding/ParseCoding.swift b/Sources/ParseSwift/Coding/ParseCoding.swift index 407901c48..227020c50 100644 --- a/Sources/ParseSwift/Coding/ParseCoding.swift +++ b/Sources/ParseSwift/Coding/ParseCoding.swift @@ -41,6 +41,48 @@ extension ParseCoding { } } +// MARK: Coding +public extension ParseObject { + + /// The Parse encoder is used to JSON encode all `ParseObject`s and + /// types in a way meaninful for a Parse Server to consume. + static func getEncoder() -> ParseEncoder { + return ParseCoding.parseEncoder() + } + + /// The Parse encoder is used to JSON encode all `ParseObject`s and + /// types in a way meaninful for a Parse Server to consume. + func getEncoder() -> ParseEncoder { + return Self.getEncoder() + } + + /// The JSON encoder setup with the correct `dateEncodingStrategy` + /// strategy to send data to a Parse Server. + static func getJSONEncoder() -> JSONEncoder { + return ParseCoding.jsonEncoder() + } + + /// The JSON encoder setup with the correct `dateEncodingStrategy` + /// strategy to send data to a Parse Server. + func getJSONEncoder() -> JSONEncoder { + return Self.getJSONEncoder() + } + + /// The JSON decoder setup with the correct `dateDecodingStrategy` + /// strategy to decode data from a Parse Server. This encoder is used to decode all data received + /// from the server. + static func getDecoder() -> JSONDecoder { + ParseCoding.jsonDecoder() + } + + /// The JSON decoder setup with the correct `dateDecodingStrategy` + /// strategy to decode data from a Parse Server. This encoder is used to decode all data received + /// from the server. + func getDecoder() -> JSONDecoder { + Self.getDecoder() + } +} + // MARK: Dates extension ParseCoding { enum DateEncodingKeys: String, CodingKey { diff --git a/Sources/ParseSwift/Internal/Data+hexString.swift b/Sources/ParseSwift/Extensions/Data.swift similarity index 98% rename from Sources/ParseSwift/Internal/Data+hexString.swift rename to Sources/ParseSwift/Extensions/Data.swift index 371c46154..3a2a13703 100644 --- a/Sources/ParseSwift/Internal/Data+hexString.swift +++ b/Sources/ParseSwift/Extensions/Data.swift @@ -1,5 +1,5 @@ // -// Data+hexString.swift +// Data.swift // ParseSwift // // Created by Corey Baker on 2/14/21. diff --git a/Sources/ParseSwift/Extensions/Date.swift b/Sources/ParseSwift/Extensions/Date.swift new file mode 100644 index 000000000..c96d32cea --- /dev/null +++ b/Sources/ParseSwift/Extensions/Date.swift @@ -0,0 +1,20 @@ +// +// Date.swift +// ParseSwift +// +// Created by Corey Baker on 11/4/21. +// Copyright © 2021 Parse Community. All rights reserved. +// + +import Foundation + +// MARK: Date +internal extension Date { + func parseFormatted() -> String { + return ParseCoding.dateFormatter.string(from: self) + } + + var parseRepresentation: [String: String] { + return ["__type": "Date", "iso": parseFormatted()] + } +} diff --git a/Sources/ParseSwift/Extensions/Encodable.swift b/Sources/ParseSwift/Extensions/Encodable.swift new file mode 100644 index 000000000..1a32154d5 --- /dev/null +++ b/Sources/ParseSwift/Extensions/Encodable.swift @@ -0,0 +1,21 @@ +// +// Encodable.swift +// ParseSwift +// +// Created by Corey Baker on 11/4/21. +// Copyright © 2021 Parse Community. All rights reserved. +// + +import Foundation + +internal extension Encodable { + func isEqual(_ other: Encodable) -> Bool { + guard let lhsData = try? ParseCoding.parseEncoder().encode(self), + let lhsString = String(data: lhsData, encoding: .utf8), + let rhsData = try? ParseCoding.parseEncoder().encode(other), + let rhsString = String(data: rhsData, encoding: .utf8) else { + return false + } + return lhsString == rhsString + } +} diff --git a/Sources/ParseSwift/API/URLCache+extensions.swift b/Sources/ParseSwift/Extensions/URLCache.swift similarity index 97% rename from Sources/ParseSwift/API/URLCache+extensions.swift rename to Sources/ParseSwift/Extensions/URLCache.swift index 3251a429c..ce523dac8 100644 --- a/Sources/ParseSwift/API/URLCache+extensions.swift +++ b/Sources/ParseSwift/Extensions/URLCache.swift @@ -1,5 +1,5 @@ // -// URLCache+extensions.swift +// URLCache.swift // ParseSwift // // Created by Corey Baker on 7/17/21. @@ -11,7 +11,7 @@ import Foundation import FoundationNetworking #endif -extension URLCache { +internal extension URLCache { static let parse: URLCache = { guard let cacheURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else { return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity, diff --git a/Sources/ParseSwift/API/URLSession+extensions.swift b/Sources/ParseSwift/Extensions/URLSession.swift similarity index 90% rename from Sources/ParseSwift/API/URLSession+extensions.swift rename to Sources/ParseSwift/Extensions/URLSession.swift index 63aa8dc30..345e586d4 100755 --- a/Sources/ParseSwift/API/URLSession+extensions.swift +++ b/Sources/ParseSwift/Extensions/URLSession.swift @@ -1,9 +1,9 @@ // -// URLSession+extensions.swift +// URLSession.swift // ParseSwift // // Original file, URLSession+sync.swift, created by Florent Vilmart on 17-09-24. -// Name change to URLSession+extensions.swift and support for sync/async by Corey Baker on 7/25/20. +// Name change to URLSession.swift and support for sync/async by Corey Baker on 7/25/20. // Copyright © 2020 Parse Community. All rights reserved. // @@ -12,7 +12,7 @@ import Foundation import FoundationNetworking #endif -extension URLSession { +internal extension URLSession { static let parse: URLSession = { if !ParseSwift.configuration.isTestingSDK { let configuration = URLSessionConfiguration.default @@ -29,11 +29,11 @@ extension URLSession { } }() - internal func makeResult(request: URLRequest, - responseData: Data?, - urlResponse: URLResponse?, - responseError: Error?, - mapper: @escaping (Data) throws -> U) -> Result { + func makeResult(request: URLRequest, + responseData: Data?, + urlResponse: URLResponse?, + responseError: Error?, + mapper: @escaping (Data) throws -> U) -> Result { guard let response = urlResponse else { guard let parseError = responseError as? ParseError else { return .failure(ParseError(code: .unknownError, @@ -87,11 +87,11 @@ extension URLSession { message: "Unable to sync with parse-server: \(String(describing: urlResponse)).")) } - internal func makeResult(request: URLRequest, - location: URL?, - urlResponse: URLResponse?, - responseError: Error?, - mapper: @escaping (Data) throws -> U) -> Result { + func makeResult(request: URLRequest, + location: URL?, + urlResponse: URLResponse?, + responseError: Error?, + mapper: @escaping (Data) throws -> U) -> Result { guard let response = urlResponse else { guard let parseError = responseError as? ParseError else { return .failure(ParseError(code: .unknownError, @@ -125,7 +125,7 @@ extension URLSession { message: "Unable to sync with parse-server: \(response).")) } - internal func dataTask( + func dataTask( with request: URLRequest, mapper: @escaping (Data) throws -> U, completion: @escaping(Result) -> Void @@ -141,8 +141,8 @@ extension URLSession { } } -extension URLSession { - internal func uploadTask( // swiftlint:disable:this function_parameter_count +internal extension URLSession { + func uploadTask( // swiftlint:disable:this function_parameter_count callbackQueue: DispatchQueue, with request: URLRequest, from data: Data?, @@ -176,7 +176,7 @@ extension URLSession { } } - internal func downloadTask( + func downloadTask( callbackQueue: DispatchQueue, with request: URLRequest, progress: ((URLSessionDownloadTask, Int64, Int64, Int64) -> Void)?, @@ -210,7 +210,7 @@ extension URLSession { task.resume() } - internal func downloadTask( + func downloadTask( with request: URLRequest, mapper: @escaping (Data) throws -> U, completion: @escaping(Result) -> Void diff --git a/Sources/ParseSwift/Internal/BaseConfig.swift b/Sources/ParseSwift/InternalObjects/BaseConfig.swift similarity index 82% rename from Sources/ParseSwift/Internal/BaseConfig.swift rename to Sources/ParseSwift/InternalObjects/BaseConfig.swift index 3a06fab47..a534d3ebc 100644 --- a/Sources/ParseSwift/Internal/BaseConfig.swift +++ b/Sources/ParseSwift/InternalObjects/BaseConfig.swift @@ -8,4 +8,4 @@ import Foundation -struct BaseConfig: ParseConfig { } +struct BaseConfig: ParseConfig {} diff --git a/Sources/ParseSwift/Internal/BaseParseInstallation.swift b/Sources/ParseSwift/InternalObjects/BaseParseInstallation.swift similarity index 100% rename from Sources/ParseSwift/Internal/BaseParseInstallation.swift rename to Sources/ParseSwift/InternalObjects/BaseParseInstallation.swift diff --git a/Sources/ParseSwift/Internal/BaseParseUser.swift b/Sources/ParseSwift/InternalObjects/BaseParseUser.swift similarity index 100% rename from Sources/ParseSwift/Internal/BaseParseUser.swift rename to Sources/ParseSwift/InternalObjects/BaseParseUser.swift diff --git a/Sources/ParseSwift/Internal/NoBody.swift b/Sources/ParseSwift/InternalObjects/NoBody.swift similarity index 100% rename from Sources/ParseSwift/Internal/NoBody.swift rename to Sources/ParseSwift/InternalObjects/NoBody.swift diff --git a/Sources/ParseSwift/LiveQuery/Protocols/QuerySubscribable.swift b/Sources/ParseSwift/LiveQuery/Protocols/QuerySubscribable.swift index 413aadcdd..079d92ecd 100644 --- a/Sources/ParseSwift/LiveQuery/Protocols/QuerySubscribable.swift +++ b/Sources/ParseSwift/LiveQuery/Protocols/QuerySubscribable.swift @@ -13,7 +13,7 @@ import Foundation You can use this protocol on any custom class of yours, instead of `Subscription` or `SubscriptionCallback`, if it fits your use case better. */ -public protocol QuerySubscribable: AnyObject { +public protocol QuerySubscribable: AnyObject { /// The `ParseObject` associated with this subscription. associatedtype Object: ParseObject diff --git a/Sources/ParseSwift/Objects/ParseSession.swift b/Sources/ParseSwift/Objects/ParseSession.swift index 5bea69ffa..a25a09bf2 100644 --- a/Sources/ParseSwift/Objects/ParseSession.swift +++ b/Sources/ParseSwift/Objects/ParseSession.swift @@ -51,7 +51,6 @@ extension ParseSession { if let objectId = objectId { return .session(objectId: objectId) } - return .sessions } } diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift index c65c461ce..dc3bb97c5 100644 --- a/Sources/ParseSwift/ParseConstants.swift +++ b/Sources/ParseSwift/ParseConstants.swift @@ -10,7 +10,7 @@ import Foundation enum ParseConstants { static let sdk = "swift" - static let version = "2.2.1" + static let version = "2.2.2" static let fileManagementDirectory = "parse/" static let fileManagementPrivateDocumentsDirectory = "Private Documents/" static let fileManagementLibraryDirectory = "Library/" diff --git a/Sources/ParseSwift/Operations/ParseOperation+async.swift b/Sources/ParseSwift/Types/ParseOperation+async.swift similarity index 100% rename from Sources/ParseSwift/Operations/ParseOperation+async.swift rename to Sources/ParseSwift/Types/ParseOperation+async.swift diff --git a/Sources/ParseSwift/Operations/ParseOperation+combine.swift b/Sources/ParseSwift/Types/ParseOperation+combine.swift similarity index 100% rename from Sources/ParseSwift/Operations/ParseOperation+combine.swift rename to Sources/ParseSwift/Types/ParseOperation+combine.swift diff --git a/Sources/ParseSwift/Operations/ParseOperation.swift b/Sources/ParseSwift/Types/ParseOperation.swift similarity index 96% rename from Sources/ParseSwift/Operations/ParseOperation.swift rename to Sources/ParseSwift/Types/ParseOperation.swift index 2e5063667..b459c20b2 100644 --- a/Sources/ParseSwift/Operations/ParseOperation.swift +++ b/Sources/ParseSwift/Types/ParseOperation.swift @@ -13,8 +13,8 @@ import Foundation For example, setting, deleting, or incrementing a value are all `ParseOperation`'s. `ParseOperation` themselves can be considered to be immutable. - In most cases, you should not call this class directly as a `ParseOperation` can be - indirectly created from any `ParseObject` by using its `operation` property. + In most cases, you do not need to create an instance of `ParseOperation` directly as it can be + indirectly created from any `ParseObject` by using the respective `operation` property. */ public struct ParseOperation: Savable where T: ParseObject { @@ -38,7 +38,7 @@ public struct ParseOperation: Savable where T: ParseObject { throw ParseError(code: .unknownError, message: "Target shouldn't be nil") } var mutableOperation = self - if !isEqual(target[keyPath: key.1], to: value) { + if !target[keyPath: key.1].isEqual(value) { mutableOperation.operations[key.0] = value mutableOperation.target?[keyPath: key.1] = value } @@ -397,16 +397,6 @@ public struct ParseOperation: Savable where T: ParseObject { try value.encode(to: encoder) } } - - func isEqual(_ lhs: Encodable, to rhs: Encodable) -> Bool { - guard let lhsData = try? ParseCoding.parseEncoder().encode(lhs), - let lhsString = String(data: lhsData, encoding: .utf8), - let rhsData = try? ParseCoding.parseEncoder().encode(rhs), - let rhsString = String(data: rhsData, encoding: .utf8) else { - return false - } - return lhsString == rhsString - } } // MARK: Savable diff --git a/Sources/ParseSwift/Types/ParseRelation.swift b/Sources/ParseSwift/Types/ParseRelation.swift index a14545ffa..e2ea98015 100644 --- a/Sources/ParseSwift/Types/ParseRelation.swift +++ b/Sources/ParseSwift/Types/ParseRelation.swift @@ -11,6 +11,9 @@ import Foundation /** The `ParseRelation` class that is used to access all of the children of a many-to-many relationship. Each instance of `ParseRelation` is associated with a particular parent object and key. + + In most cases, you do not need to create an instance of `ParseOperation` directly as it can be + indirectly created from any `ParseObject` by using the respective `relation` property. */ public struct ParseRelation: Codable, Hashable where T: ParseObject { internal let __type: String = "Relation" // swiftlint:disable:this identifier_name diff --git a/Sources/ParseSwift/Types/Query.swift b/Sources/ParseSwift/Types/Query.swift index 03f9c932a..6877fba4f 100644 --- a/Sources/ParseSwift/Types/Query.swift +++ b/Sources/ParseSwift/Types/Query.swift @@ -64,12 +64,10 @@ public struct QueryConstraint: Encodable, Equatable { public static func == (lhs: QueryConstraint, rhs: QueryConstraint) -> Bool { guard lhs.key == rhs.key, - lhs.comparator == rhs.comparator, - let lhsObject = lhs.value as? NSObject, - let rhsObject = rhs.value as? NSObject else { + lhs.comparator == rhs.comparator else { return false } - return lhsObject == rhsObject + return lhs.value.isEqual(rhs.value) } }