diff --git a/CoreStore.podspec b/CoreStore.podspec index 3e2546b..cdc1041 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "CoreStore" - s.version = "8.0.1" - s.swift_version = "5.4" + s.version = "8.1.0" + s.swift_version = "5.5" s.license = "MIT" s.homepage = "https://github.com/JohnEstropia/CoreStore" s.documentation_url = "https://JohnEstropia.github.io/CoreStore" diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 0ea9f02..4fe9e04 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -835,9 +835,6 @@ B5DBE2D31C991B3E00B5CEFA /* CSDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */; }; B5DBE2D41C991B3E00B5CEFA /* CSDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */; }; B5DBE2D51C991B3E00B5CEFA /* CSDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */; }; - B5DBE2DF1C9939E100B5CEFA /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */; }; - B5DBE2E01C9939E100B5CEFA /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */; }; - B5DBE2E11C9939E100B5CEFA /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */; }; B5DC47C61C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */; }; B5DC47C71C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */; }; B5DC47C81C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */; }; @@ -924,10 +921,6 @@ B5ECDBEE1CA6BF2000C7F112 /* CSFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */; }; B5ECDBEF1CA6BF2000C7F112 /* CSFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */; }; B5ECDBF01CA6BF2000C7F112 /* CSFrom.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */; }; - B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */; }; - B5ECDBFB1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */; }; - B5ECDBFC1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */; }; - B5ECDBFD1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */; }; B5ECDBFF1CA80CBA00C7F112 /* CSWhere.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBFE1CA80CBA00C7F112 /* CSWhere.swift */; }; B5ECDC011CA80CBA00C7F112 /* CSWhere.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBFE1CA80CBA00C7F112 /* CSWhere.swift */; }; B5ECDC021CA80CBA00C7F112 /* CSWhere.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBFE1CA80CBA00C7F112 /* CSWhere.swift */; }; @@ -1220,9 +1213,6 @@ B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathGenericBindings.swift; sourceTree = ""; }; B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSCoreStore.swift; sourceTree = ""; }; B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSDataStack.swift; sourceTree = ""; }; - B5DBE2DA1C9939E100B5CEFA /* CoreStoreTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreStoreTests-Bridging-Header.h"; sourceTree = ""; }; - B5DBE2DD1C9939E100B5CEFA /* BridgingTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgingTests.h; sourceTree = ""; }; - B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgingTests.m; sourceTree = ""; }; B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChainTests.swift; sourceTree = ""; }; B5DC47C91C93D9C800FA3BF3 /* StorageInterfaceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageInterfaceTests.swift; sourceTree = ""; }; B5DE522A230BD7CC00A22534 /* Internals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.swift; sourceTree = ""; }; @@ -1271,7 +1261,6 @@ B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSBaseDataTransaction+Querying.swift"; sourceTree = ""; }; B5ECDBE41CA6BEA300C7F112 /* CSClauseTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSClauseTypes.swift; sourceTree = ""; }; B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSFrom.swift; sourceTree = ""; }; - B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+ObjectiveC.swift"; sourceTree = ""; }; B5ECDBFE1CA80CBA00C7F112 /* CSWhere.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSWhere.swift; sourceTree = ""; }; B5ECDC041CA8138100C7F112 /* CSOrderBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSOrderBy.swift; sourceTree = ""; }; B5ECDC0A1CA8161B00C7F112 /* CSGroupBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSGroupBy.swift; sourceTree = ""; }; @@ -1416,8 +1405,6 @@ isa = PBXGroup; children = ( B5AA37FE235DEBD700FFD4B9 /* BaseTests */, - B5DBE2DD1C9939E100B5CEFA /* BridgingTests.h */, - B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */, B5D339B31E925C2B00C880DE /* DynamicModelTests.swift */, B5519A3F1CA1B17B002BEF78 /* ErrorTests.swift */, B52557871D02DE8100E51965 /* FetchTests.swift */, @@ -1452,7 +1439,6 @@ children = ( B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */, 2F03A53E19C5C6DA005002A5 /* Info.plist */, - B5DBE2DA1C9939E100B5CEFA /* CoreStoreTests-Bridging-Header.h */, ); name = "Supporting Files"; sourceTree = ""; @@ -1815,7 +1801,6 @@ B501FDDB1CA8D03600BE22EF /* Observing */, B5E1B5A61CAA49CE007FD580 /* Migrating */, B53FBA101CAB607000F0D40A /* Convenience */, - B5E222211CA4DE5700BA2E95 /* Internal */, ); name = ObjectiveC; sourceTree = ""; @@ -1831,14 +1816,6 @@ name = Migrating; sourceTree = ""; }; - B5E222211CA4DE5700BA2E95 /* Internal */ = { - isa = PBXGroup; - children = ( - B5ECDBF81CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift */, - ); - name = Internal; - sourceTree = ""; - }; B5E2222F1CA5339200BA2E95 /* Fetching and Querying */ = { isa = PBXGroup; children = ( @@ -2353,7 +2330,6 @@ B56E4ED423CDB54A00E1708C /* FieldProtocol.swift in Sources */, B509D7C423C848DA00F42824 /* Relationship.ToOne.swift in Sources */, B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */, - B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */, B5CA2B081F7E5ACA004B1936 /* WhereClauseType.swift in Sources */, B50E17612351FA66004F033C /* Internals.Closure.swift in Sources */, B50C3EEA23D1601400B29880 /* FieldCoders.swift in Sources */, @@ -2593,7 +2569,6 @@ B580857A1CDF808C004C2EEB /* SetupTests.swift in Sources */, B59A51832256C85E00CEF3C5 /* VersionLockTests.swift in Sources */, B5489F4C1CF5F743008B4978 /* BaseTestCase.swift in Sources */, - B5DBE2DF1C9939E100B5CEFA /* BridgingTests.m in Sources */, B57D27BE1D0BBE8200539C58 /* BaseTestDataTestCase.swift in Sources */, B5489F3F1CF5EEBC008B4978 /* TestEntity1.swift in Sources */, B57D27C21D0BC20100539C58 /* QueryTests.swift in Sources */, @@ -2606,7 +2581,6 @@ buildActionMask = 2147483647; files = ( 82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */, - B5ECDBFB1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */, B5635D152356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */, B5CA2B091F7E5ACA004B1936 /* WhereClauseType.swift in Sources */, B5C976E81C6E3A5D00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */, @@ -2834,7 +2808,6 @@ B5D8CA7D2346EC610055D7D1 /* ListPublisherTests.swift in Sources */, B52557751D02791400E51965 /* WhereTests.swift in Sources */, B5DC47C71C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */, - B5DBE2E01C9939E100B5CEFA /* BridgingTests.m in Sources */, B5220E0D1D0D0D19009BC71E /* ImportTests.swift in Sources */, B5D339B51E925C2B00C880DE /* DynamicModelTests.swift in Sources */, B525576D1CFAF18F00E51965 /* IntoTests.swift in Sources */, @@ -2928,7 +2901,6 @@ B5519A4D1CA1F4FB002BEF78 /* CSError.swift in Sources */, B5E1B5AC1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */, B52DD1961BE1F92500949AFE /* DataStack.swift in Sources */, - B5ECDBFD1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */, B56ED34F263FF64B00ACCCB8 /* Internals.AppGroupsManager.swift in Sources */, B52DD1BD1BE1F94300949AFE /* NSManagedObject+Convenience.swift in Sources */, B5831F4222126FED00D8604C /* KeyPathGenericBindings.swift in Sources */, @@ -3090,7 +3062,6 @@ B52557761D02791400E51965 /* WhereTests.swift in Sources */, B5D8CA7E2346EC610055D7D1 /* ListPublisherTests.swift in Sources */, B5DC47C81C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */, - B5DBE2E11C9939E100B5CEFA /* BridgingTests.m in Sources */, B5220E0E1D0D0D19009BC71E /* ImportTests.swift in Sources */, B525576E1CFAF18F00E51965 /* IntoTests.swift in Sources */, B5D339B61E925C2B00C880DE /* DynamicModelTests.swift in Sources */, @@ -3120,7 +3091,6 @@ buildActionMask = 2147483647; files = ( B56321A91BD65219006C9394 /* Progress+Convenience.swift in Sources */, - B5ECDBFC1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */, B5635D162356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */, B5CA2B0A1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */, B5C976E91C6E3A5E00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */, @@ -3505,7 +3475,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3528,7 +3498,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3554,7 +3524,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = CoreStoreTests; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; @@ -3570,7 +3539,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = CoreStoreTests; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; name = Release; @@ -3588,7 +3556,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3615,7 +3583,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3640,7 +3608,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = CoreStoreTests; SDKROOT = appletvos; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 3; @@ -3659,7 +3626,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = CoreStoreTests; SDKROOT = appletvos; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = 3; }; @@ -3681,7 +3647,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3710,7 +3676,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3736,7 +3702,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStoreTests; SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; @@ -3757,7 +3722,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStoreTests; SDKROOT = macosx; - SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; name = Release; @@ -3776,7 +3740,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, @@ -3805,7 +3769,7 @@ GCC_NO_COMMON_BLOCKS = YES; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 8.0.1; + MARKETING_VERSION = 8.1.0; OTHER_LDFLAGS = ( "-weak_framework", Combine, diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme index 0e3954f..37f42c2 100644 --- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme +++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme @@ -1,6 +1,6 @@ - - diff --git a/CoreStoreTests/BridgingTests.h b/CoreStoreTests/BridgingTests.h deleted file mode 100644 index e2661da..0000000 --- a/CoreStoreTests/BridgingTests.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// BridgingTests.h -// CoreStore -// -// Copyright © 2018 John Rommel Estropia -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// - -#import - -@interface BridgingTests : XCTestCase - -@end diff --git a/CoreStoreTests/BridgingTests.m b/CoreStoreTests/BridgingTests.m deleted file mode 100644 index 31040ea..0000000 --- a/CoreStoreTests/BridgingTests.m +++ /dev/null @@ -1,261 +0,0 @@ -// -// BridgingTests.m -// CoreStore -// -// Copyright © 2018 John Rommel Estropia -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// - -#import "BridgingTests.h" -#import -#import -#import "CoreStoreTests-Swift.h" - -@import CoreData; - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - - -// MARK: - BridgingTests - -@implementation BridgingTests - -- (void)test_ThatFlags_HaveCorrectValues { - - XCTAssertEqual(CSLocalStorageOptionsNone, 0); - XCTAssertEqual(CSLocalStorageOptionsRecreateStoreOnModelMismatch, 1); - XCTAssertEqual(CSLocalStorageOptionsPreventProgressiveMigration, 2); - XCTAssertEqual(CSLocalStorageOptionsAllowSynchronousLightweightMigration, 4); -} - -- (void)test_ThatKeyPaths_AreCorrect { - - XCTAssertEqualObjects(CSKeyPath(TestEntity1, testNumber), @"testNumber"); - XCTAssertEqualObjects(CSKeyPath(TestEntity1, testString), @"testString"); - XCTAssertEqualObjects(CSKeyPathOperator(count, TestEntity1, testString), @"@count.testString"); - XCTAssertEqualObjects(CSKeyPathOperator(max, TestEntity1, testNumber), @"@max.testNumber"); -} - -- (void)test_ThatFromClauses_BridgeCorrectly { - - { - CSFrom *from = CSFromClass([TestEntity1 class]); - XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]); - XCTAssertNil(from.configurations); - } - { - CSFrom *from = CSFromClass([TestEntity1 class], [NSNull null]); - XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]); - - NSArray *configurations = @[[NSNull null]]; - XCTAssertEqualObjects(from.configurations, configurations); - } - { - CSFrom *from = CSFromClass([TestEntity1 class], @"Config1"); - XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]); - - NSArray *configurations = @[@"Config1"]; - XCTAssertEqualObjects(from.configurations, configurations); - } - { - CSFrom *from = CSFromClass([TestEntity1 class], @[[NSNull null], @"Config2"]); - XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]); - - NSArray *configurations = @[[NSNull null], @"Config2"]; - XCTAssertEqualObjects(from.configurations, configurations); - } -} - -- (void)test_ThatWhereClauses_BridgeCorrectly { - - { - CSWhere *where = CSWhereFormat(@"%K == %@", @"key", @"value"); - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"]; - XCTAssertEqualObjects(where.predicate, predicate); - } - { - CSWhere *where = CSWhereValue(YES); - NSPredicate *predicate = [NSPredicate predicateWithValue:YES]; - XCTAssertEqualObjects(where.predicate, predicate); - } - { - CSWhere *where = CSWherePredicate([NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"]); - NSPredicate *predicate = [NSPredicate predicateWithFormat:@"%K == %@", @"key", @"value"]; - XCTAssertEqualObjects(where.predicate, predicate); - } -} - -- (void)test_ThatOrderByClauses_BridgeCorrectly { - - { - CSOrderBy *orderBy = CSOrderByKey(CSSortAscending(@"key")); - XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:YES]]); - } - { - CSOrderBy *orderBy = CSOrderByKey(CSSortDescending(@"key")); - XCTAssertEqualObjects(orderBy.sortDescriptors, @[[NSSortDescriptor sortDescriptorWithKey:@"key" ascending:NO]]); - } - { - CSOrderBy *orderBy = CSOrderByKeys(CSSortAscending(@"key1"), CSSortDescending(@"key2"), nil); - NSArray *sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"key1" ascending:YES], - [NSSortDescriptor sortDescriptorWithKey:@"key2" ascending:NO]]; - XCTAssertEqualObjects(orderBy.sortDescriptors, sortDescriptors); - } -} - -- (void)test_ThatGroupByClauses_BridgeCorrectly { - - { - CSGroupBy *groupBy = CSGroupByKeyPath(@"key"); - XCTAssertEqualObjects(groupBy.keyPaths, @[@"key"]); - } - { - CSGroupBy *groupBy = CSGroupByKeyPaths(@[@"key1", @"key2"]); - - NSArray *keyPaths = @[@"key1", @"key2"]; - XCTAssertEqualObjects(groupBy.keyPaths, keyPaths); - } -} - -- (void)test_ThatTweakClauses_BridgeCorrectly { - - CSTweak *tweak = CSTweakRequest(^(NSFetchRequest * _Nonnull fetchRequest) { - - fetchRequest.fetchLimit = 100; - }); - NSFetchRequest *request = [NSFetchRequest new]; - tweak.block(request); - XCTAssertEqual(request.fetchLimit, 100); -} - -- (void)test_ThatIntoClauses_BridgeCorrectly { - - { - CSInto *into = CSIntoClass([TestEntity1 class]); - XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]); - } - { - CSInto *into = CSIntoClass([TestEntity1 class], [NSNull null]); - XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]); - XCTAssertNil(into.configuration); - } - { - CSInto *into = CSIntoClass([TestEntity1 class], @"Config1"); - XCTAssertEqualObjects(into.entityClass, [TestEntity1 class]); - XCTAssertEqualObjects(into.configuration, @"Config1"); - } -} - -- (void)test_ThatDataStacks_BridgeCorrectly { - - CSDataStack *dataStack = [[CSDataStack alloc] - initWithXcodeModelName:@"Model" - bundle:[NSBundle bundleForClass:[self class]] - versionChain:nil]; - XCTAssertNotNil(dataStack); - - NSError *memoryError; - CSInMemoryStore *memoryStorage = [dataStack - addInMemoryStorageAndWait:[CSInMemoryStore new] - error:&memoryError]; - XCTAssertNotNil(memoryStorage); - XCTAssertEqualObjects([[memoryStorage class] storeType], [CSInMemoryStore storeType]); - XCTAssertEqualObjects([[memoryStorage class] storeType], NSInMemoryStoreType); - XCTAssertNil(memoryStorage.configuration); - XCTAssertNil(memoryStorage.storeOptions); - XCTAssertNil(memoryError); - - NSError *sqliteError; - CSSQLiteStore *sqliteStorage = [dataStack - addSQLiteStorageAndWait:[CSSQLiteStore new] - error:&sqliteError]; - XCTAssertNotNil(sqliteStorage); - XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]); - XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType); - XCTAssertNil(sqliteStorage.configuration); - NSDictionary *storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }, - NSBinaryStoreInsecureDecodingCompatibilityOption: @YES }; - XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions); - XCTAssertNil(sqliteError); -} - -- (void)test_ThatTransactions_BridgeCorrectly { - - CSDataStack *dataStack = [[CSDataStack alloc] - initWithXcodeModelName:@"Model" - bundle:[NSBundle bundleForClass:[self class]] - versionChain:nil]; - XCTAssertNotNil(dataStack); - - [dataStack - addInMemoryStorageAndWait:[CSInMemoryStore new] - error:nil]; - - { - CSUnsafeDataTransaction *transaction = [dataStack beginUnsafe]; - XCTAssertNotNil(transaction); - XCTAssert([transaction isKindOfClass:[CSUnsafeDataTransaction class]]); - NSError *error; - BOOL result = [transaction commitAndWaitWithError:&error]; - XCTAssertTrue(result); - XCTAssertNil(error); - } - { - XCTestExpectation *expectation = [self expectationWithDescription:@"sync"]; - NSError *error; - BOOL result = - [dataStack - beginSynchronous:^(CSSynchronousDataTransaction * _Nonnull transaction) { - - XCTAssertNotNil(transaction); - XCTAssert([transaction isKindOfClass:[CSSynchronousDataTransaction class]]); - NSError *error; - XCTAssertTrue([transaction commitAndWaitWithError:&error]); - XCTAssertNil(error); - [expectation fulfill]; - } - error:&error]; - XCTAssertTrue(result); - XCTAssertNil(error); - } - { - XCTestExpectation *expectation = [self expectationWithDescription:@"async"]; - [dataStack beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) { - - XCTAssertNotNil(transaction); - XCTAssert([transaction isKindOfClass:[CSAsynchronousDataTransaction class]]); - [transaction - commitWithSuccess:^{ - - [expectation fulfill]; - } - failure:^(CSError *error){ - - XCTFail(); - }]; - }]; - } - [self waitForExpectationsWithTimeout:10 handler:nil]; -} - -@end - -#pragma clang diagnostic pop diff --git a/CoreStoreTests/CoreStoreTests-Bridging-Header.h b/CoreStoreTests/CoreStoreTests-Bridging-Header.h deleted file mode 100644 index d5b75f7..0000000 --- a/CoreStoreTests/CoreStoreTests-Bridging-Header.h +++ /dev/null @@ -1,5 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - -#import "BridgingTests.h" \ No newline at end of file diff --git a/CoreStoreTests/ErrorTests.swift b/CoreStoreTests/ErrorTests.swift index 35f8527..efdb155 100644 --- a/CoreStoreTests/ErrorTests.swift +++ b/CoreStoreTests/ErrorTests.swift @@ -31,7 +31,6 @@ import CoreStore // MARK: - ErrorTests -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") final class ErrorTests: XCTestCase { @objc @@ -43,14 +42,12 @@ final class ErrorTests: XCTestCase { let userInfo: NSDictionary = [:] - let objcError = error.bridgeToObjectiveC - XCTAssertEqual(error, objcError.bridgeToSwift) + let objcError = error as NSError XCTAssertEqual(objcError.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError.code, CoreStoreErrorCode.unknownError.rawValue) XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo) - let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC - XCTAssertEqual(error, objcError2.bridgeToSwift) + let objcError2 = CoreStoreError(objcError) as NSError XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError2.code, CoreStoreErrorCode.unknownError.rawValue) XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo) @@ -68,14 +65,12 @@ final class ErrorTests: XCTestCase { let userInfo: NSDictionary = [ "existingPersistentStoreURL": dummyURL ] - let objcError = error.bridgeToObjectiveC - XCTAssertEqual(error, objcError.bridgeToSwift) + let objcError = error as NSError XCTAssertEqual(objcError.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue) XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo) - - let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC - XCTAssertEqual(error, objcError2.bridgeToSwift) + + let objcError2 = CoreStoreError(objcError) as NSError XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError2.code, CoreStoreErrorCode.differentStorageExistsAtURL.rawValue) XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo) @@ -103,14 +98,12 @@ final class ErrorTests: XCTestCase { "targetModel": schemaHistory.rawModel, "targetModelVersion": version ] - let objcError = error.bridgeToObjectiveC - XCTAssertEqual(error, objcError.bridgeToSwift) + let objcError = error as NSError XCTAssertEqual(objcError.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError.code, CoreStoreErrorCode.mappingModelNotFound.rawValue) XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo) - - let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC - XCTAssertEqual(error, objcError2.bridgeToSwift) + + let objcError2 = CoreStoreError(objcError) as NSError XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError2.code, CoreStoreErrorCode.mappingModelNotFound.rawValue) XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo) @@ -128,14 +121,12 @@ final class ErrorTests: XCTestCase { let userInfo: NSDictionary = [ "localStoreURL": dummyURL ] - let objcError = error.bridgeToObjectiveC - XCTAssertEqual(error, objcError.bridgeToSwift) + let objcError = error as NSError XCTAssertEqual(objcError.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue) XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo) - - let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC - XCTAssertEqual(error, objcError2.bridgeToSwift) + + let objcError2 = CoreStoreError(objcError) as NSError XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError2.code, CoreStoreErrorCode.progressiveMigrationRequired.rawValue) XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo) @@ -160,14 +151,12 @@ final class ErrorTests: XCTestCase { let userInfo: NSDictionary = [ "NSError": internalError ] - let objcError = error.bridgeToObjectiveC - XCTAssertEqual(error, objcError.bridgeToSwift) + let objcError = error as NSError XCTAssertEqual(objcError.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError.code, CoreStoreErrorCode.internalError.rawValue) XCTAssertEqual(objcError.userInfo as NSDictionary, userInfo) - - let objcError2 = objcError.bridgeToSwift.bridgeToObjectiveC - XCTAssertEqual(error, objcError2.bridgeToSwift) + + let objcError2 = CoreStoreError(objcError) as NSError XCTAssertEqual(objcError2.domain, CoreStoreErrorDomain) XCTAssertEqual(objcError2.code, CoreStoreErrorCode.internalError.rawValue) XCTAssertEqual(objcError2.userInfo as NSDictionary, userInfo) diff --git a/CoreStoreTests/IntoTests.swift b/CoreStoreTests/IntoTests.swift index 73659fa..9ff8754 100644 --- a/CoreStoreTests/IntoTests.swift +++ b/CoreStoreTests/IntoTests.swift @@ -126,15 +126,4 @@ final class IntoTests: XCTestCase { XCTAssertNotEqual(into, Into("Config2")) } } - - @objc - dynamic func test_ThatIntoClauses_BridgeCorrectly() { - - do { - - let into = Into() - let objcInto = into.bridgeToObjectiveC - XCTAssertEqual(into, objcInto.bridgeToSwift) - } - } } diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 636161f..6319775 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -41,12 +41,6 @@ B5A3916524E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A3916424E698C700E7E8BD /* Modern.PlacemarksDemo.Place.swift */; }; B5A3916B24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916724E698F900E7E8BD /* CoreStore.framework */; }; B5A3916C24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916724E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5A3916D24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916824E698F900E7E8BD /* CoreStore.framework */; }; - B5A3916E24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916824E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5A3916F24E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916924E698F900E7E8BD /* CoreStore.framework */; }; - B5A3917024E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916924E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5A3917124E698F900E7E8BD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916A24E698F900E7E8BD /* CoreStore.framework */; }; - B5A3917224E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3916A24E698F900E7E8BD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B5A3917524E6990200E7E8BD /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917424E6990200E7E8BD /* MapKit.framework */; }; B5A3917724E6990700E7E8BD /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917624E6990700E7E8BD /* CoreLocation.framework */; }; B5A3917924E6991600E7E8BD /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A3917824E6991600E7E8BD /* SwiftUI.framework */; }; @@ -116,9 +110,6 @@ dstSubfolderSpec = 10; files = ( B5A3916C24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */, - B5A3917224E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */, - B5A3917024E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */, - B5A3916E24E698F900E7E8BD /* CoreStore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -234,11 +225,8 @@ files = ( B5A3917724E6990700E7E8BD /* CoreLocation.framework in Frameworks */, B5A3916B24E698F900E7E8BD /* CoreStore.framework in Frameworks */, - B5A3917124E698F900E7E8BD /* CoreStore.framework in Frameworks */, B5A3917924E6991600E7E8BD /* SwiftUI.framework in Frameworks */, B5A3917524E6990200E7E8BD /* MapKit.framework in Frameworks */, - B5A3916F24E698F900E7E8BD /* CoreStore.framework in Frameworks */, - B5A3916D24E698F900E7E8BD /* CoreStore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -633,7 +621,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1160; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1300; TargetAttributes = { B5A3911824E5429200E7E8BD = { CreatedOnToolsVersion = 11.6; @@ -809,6 +797,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; diff --git a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme index bae747d..2e8c7e3 100644 --- a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme +++ b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme @@ -1,6 +1,6 @@ ()) }, + sourceIdentifier: TransactionSource.clear, completion: { _ in } ) } @@ -113,6 +114,7 @@ extension Modern.ColorsDemo { _ = transaction.create(Into()) }, + sourceIdentifier: TransactionSource.add, completion: { _ in } ) } @@ -127,6 +129,7 @@ extension Modern.ColorsDemo { palette.setRandomHue() } }, + sourceIdentifier: TransactionSource.shuffle, completion: { _ in } ) } diff --git a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/Modern.ColorsDemo.swift b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/Modern.ColorsDemo.swift index 510b292..ab8b7cc 100644 --- a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/Modern.ColorsDemo.swift +++ b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/Modern.ColorsDemo.swift @@ -65,9 +65,22 @@ extension Modern { sectionIndexTransformer: { $0?.first?.uppercased() } ) .where(self.filter.whereClause()) - .orderBy(.ascending(\.$hue)) + .orderBy(.ascending(\.$hue)), + sourceIdentifier: TransactionSource.refetch ) } } + + + // MARK: - TransactionSource + + enum TransactionSource { + + case add + case delete + case shuffle + case clear + case refetch + } } } diff --git a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift index f342082..b2a5077 100644 --- a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift +++ b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.DetailViewController.swift @@ -91,7 +91,8 @@ extension Modern.ColorsDemo.UIKit { func objectMonitor( _ monitor: ObjectMonitor, didUpdateObject object: Modern.ColorsDemo.Palette, - changedPersistentKeys: Set + changedPersistentKeys: Set, + sourceIdentifier: Any? ) { self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys) diff --git a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.ListViewController.swift b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.ListViewController.swift index da31101..46e5e6f 100644 --- a/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.ListViewController.swift +++ b/Demo/⭐️Sources/⭐️Demos/⭐️Modern/⭐️ColorsDemo/⭐️Modern.ColorsDemo.UIKit.ListViewController.swift @@ -32,17 +32,26 @@ extension Modern.ColorsDemo.UIKit { ) /** - ⭐️ Sample 2: Once the views are created, we can start binding `ListPublisher` updates to the `DiffableDataSource`. We typically call this at the end of `viewDidLoad`. Note that the `addObserver`'s closure argument will only be called on the succeeding updates, so to immediately display the current values, we need to call `dataSource.apply()` once. + ⭐️ Sample 2: Once the views are created, we can start binding `ListPublisher` updates to the `DiffableDataSource`. We typically call this at the end of `viewDidLoad`. Note that the `addObserver`'s closure argument will only be called on the succeeding updates, so to immediately display the current values, we need to call `dataSource.apply()` once. This example inspects the optional `transactionSource` to determine the source of the update which is helpful for debugging or for fine-tuning animations. */ private func startObservingList() { let dataSource = self.dataSource - self.listPublisher.addObserver(self) { (listPublisher) in + self.listPublisher.addObserver(self, notifyInitial: true) { (listPublisher, transactionSource) in - dataSource.apply(listPublisher.snapshot, animatingDifferences: true) + switch transactionSource as? Modern.ColorsDemo.TransactionSource { + + case .add, + .delete, + .shuffle, + .clear: + dataSource.apply(listPublisher.snapshot, animatingDifferences: true) + + case nil, + .refetch: + dataSource.apply(listPublisher.snapshot, animatingDifferences: false) + } } - - dataSource.apply(self.listPublisher.snapshot, animatingDifferences: false) } /** @@ -74,6 +83,7 @@ extension Modern.ColorsDemo.UIKit { transaction.delete(objectIDs: [itemID]) }, + sourceIdentifier: Modern.ColorsDemo.TransactionSource.delete, completion: { _ in } ) diff --git a/LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj b/LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj deleted file mode 100644 index 7f14ca8..0000000 --- a/LegacyDemo/LegacyDemo.xcodeproj/project.pbxproj +++ /dev/null @@ -1,597 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - B50132242344E24300FC238B /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132232344E24300FC238B /* SwiftUIView.swift */; }; - B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */; }; - B501323523477D2300FC238B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323423477D2300FC238B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */; }; - B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */; }; - B503FAE11AFDC71700F90881 /* Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADD1AFDC71700F90881 /* Palette.swift */; }; - B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */; }; - B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */; }; - B52977D91B120B80003D50A5 /* ObserversViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977D81B120B80003D50A5 /* ObserversViewController.swift */; }; - B52977DD1B120F3B003D50A5 /* TransactionsDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977DC1B120F3B003D50A5 /* TransactionsDemoViewController.swift */; }; - B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52977DE1B120F83003D50A5 /* MapKit.framework */; }; - B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52977E01B120F8A003D50A5 /* CoreLocation.framework */; }; - B52977E41B121635003D50A5 /* Place.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977E31B121635003D50A5 /* Place.swift */; }; - B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */; }; - B54AAD521AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */; }; - B54AAD591AF4D26E00848AE0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD571AF4D26E00848AE0 /* Main.storyboard */; }; - B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */; }; - B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */; }; - B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */; }; - B5635D192357F9F700B80E6B /* CollectionViewDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */; }; - B5635D1B2357FA4B00B80E6B /* PaletteCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */; }; - B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */; }; - B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3311B11DF3200F4F0C6 /* UserAccount.swift */; }; - B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */; }; - B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */; }; - B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D91B231BCA0075EE4A /* MaleAccount.swift */; }; - B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */; }; - B569650C1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */; }; - B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965171B2E20CC0075EE4A /* TimeZone.swift */; }; - B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; }; - B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; }; - B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; }; - B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */; }; - B5C37EE52357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */; }; - B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; }; - B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; }; - B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; }; - B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; }; - B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */; }; - B5EE259B1B3EA4890000406B /* OrganismV3.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259A1B3EA4890000406B /* OrganismV3.swift */; }; - B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - B5E89ACF1C52929C003B04A9 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - B50132232344E24300FC238B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = ""; }; - B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIContainerViewController.swift; sourceTree = ""; }; - B501323423477D2300FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; - B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverDemoViewController.swift; sourceTree = ""; }; - B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverDemoViewController.swift; sourceTree = ""; }; - B503FADD1AFDC71700F90881 /* Palette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Palette.swift; sourceTree = ""; }; - B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaletteTableViewCell.swift; sourceTree = ""; }; - B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = OrganismV2ToV3.xcmappingmodel; sourceTree = ""; }; - B5125C131B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = OrganismV3ToV2.xcmappingmodel; sourceTree = ""; }; - B52977D81B120B80003D50A5 /* ObserversViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserversViewController.swift; sourceTree = ""; }; - B52977DC1B120F3B003D50A5 /* TransactionsDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionsDemoViewController.swift; sourceTree = ""; }; - B52977DE1B120F83003D50A5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; }; - B52977E01B120F8A003D50A5 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - B52977E31B121635003D50A5 /* Place.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Place.swift; sourceTree = ""; }; - B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LegacyDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; - B54AAD4D1AF4D26E00848AE0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LegacyDemo.xcdatamodel; sourceTree = ""; }; - B54AAD581AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2ToV3MigrationPolicy.swift; sourceTree = ""; }; - B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewDemoViewController.swift; sourceTree = ""; }; - B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionViewCell.swift; sourceTree = ""; }; - B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackSetupDemoViewController.swift; sourceTree = ""; }; - B566E3311B11DF3200F4F0C6 /* UserAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAccount.swift; sourceTree = ""; }; - B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomLoggerViewController.swift; sourceTree = ""; }; - B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = StackSetupDemo.xcdatamodel; sourceTree = ""; }; - B56964D91B231BCA0075EE4A /* MaleAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaleAccount.swift; sourceTree = ""; }; - B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FemaleAccount.swift; sourceTree = ""; }; - B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingAndQueryingDemoViewController.swift; sourceTree = ""; }; - B56965171B2E20CC0075EE4A /* TimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZone.swift; sourceTree = ""; }; - B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = ""; }; - B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = ""; }; - B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = ""; }; - B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsDemo.swift; sourceTree = ""; }; - B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionSectionHeaderView.swift; sourceTree = ""; }; - B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; }; - B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = ""; }; - B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = ""; }; - B5EE25861B36E2520000406B /* OrganismV2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2.swift; sourceTree = ""; }; - B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV3.xcdatamodel; sourceTree = ""; }; - B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationsDemoViewController.swift; sourceTree = ""; }; - B5EE259A1B3EA4890000406B /* OrganismV3.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV3.swift; sourceTree = ""; }; - B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismProtocol.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - B54AAD461AF4D26E00848AE0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - B501323523477D2300FC238B /* SwiftUI.framework in Frameworks */, - B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */, - B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */, - B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - B50132222344E20B00FC238B /* SwiftUI Demo */ = { - isa = PBXGroup; - children = ( - B50132232344E24300FC238B /* SwiftUIView.swift */, - B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */, - ); - path = "SwiftUI Demo"; - sourceTree = ""; - }; - B503FADA1AFDC71700F90881 /* List and Object Observers Demo */ = { - isa = PBXGroup; - children = ( - B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */, - B52977D81B120B80003D50A5 /* ObserversViewController.swift */, - B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */, - B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */, - B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */, - B503FADD1AFDC71700F90881 /* Palette.swift */, - B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */, - B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */, - B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */, - ); - path = "List and Object Observers Demo"; - sourceTree = ""; - }; - B52977DB1B120F2C003D50A5 /* Transactions Demo */ = { - isa = PBXGroup; - children = ( - B52977E31B121635003D50A5 /* Place.swift */, - B52977DC1B120F3B003D50A5 /* TransactionsDemoViewController.swift */, - ); - path = "Transactions Demo"; - sourceTree = ""; - }; - B52977E21B120F90003D50A5 /* Frameworks */ = { - isa = PBXGroup; - children = ( - B501323423477D2300FC238B /* SwiftUI.framework */, - B52977E01B120F8A003D50A5 /* CoreLocation.framework */, - B5BDC9211C202429008147CD /* CoreStore.framework */, - B52977DE1B120F83003D50A5 /* MapKit.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - B54AAD401AF4D26E00848AE0 = { - isa = PBXGroup; - children = ( - B52977E21B120F90003D50A5 /* Frameworks */, - B54AAD4B1AF4D26E00848AE0 /* LegacyDemo */, - B54AAD4A1AF4D26E00848AE0 /* Products */, - ); - sourceTree = ""; - }; - B54AAD4A1AF4D26E00848AE0 /* Products */ = { - isa = PBXGroup; - children = ( - B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */, - ); - name = Products; - sourceTree = ""; - }; - B54AAD4B1AF4D26E00848AE0 /* LegacyDemo */ = { - isa = PBXGroup; - children = ( - B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */, - B50132222344E20B00FC238B /* SwiftUI Demo */, - B566E3271B117AE700F4F0C6 /* Stack Setup Demo */, - B503FADA1AFDC71700F90881 /* List and Object Observers Demo */, - B52977DB1B120F2C003D50A5 /* Transactions Demo */, - B56965091B2B35370075EE4A /* Fetching and Querying Demo */, - B569652F1B3591460075EE4A /* Migrations Demo */, - B56964C61B20AC200075EE4A /* Loggers Demo */, - B54AAD571AF4D26E00848AE0 /* Main.storyboard */, - B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */, - B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */, - B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */, - B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */, - B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */, - B54AAD4C1AF4D26E00848AE0 /* Supporting Files */, - ); - path = LegacyDemo; - sourceTree = ""; - }; - B54AAD4C1AF4D26E00848AE0 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - B54AAD4D1AF4D26E00848AE0 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - B566E3271B117AE700F4F0C6 /* Stack Setup Demo */ = { - isa = PBXGroup; - children = ( - B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */, - B56964D91B231BCA0075EE4A /* MaleAccount.swift */, - B566E3311B11DF3200F4F0C6 /* UserAccount.swift */, - B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */, - ); - path = "Stack Setup Demo"; - sourceTree = ""; - }; - B56964C61B20AC200075EE4A /* Loggers Demo */ = { - isa = PBXGroup; - children = ( - B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */, - ); - path = "Loggers Demo"; - sourceTree = ""; - }; - B56965091B2B35370075EE4A /* Fetching and Querying Demo */ = { - isa = PBXGroup; - children = ( - B56965171B2E20CC0075EE4A /* TimeZone.swift */, - B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */, - B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */, - B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */, - ); - path = "Fetching and Querying Demo"; - sourceTree = ""; - }; - B569652F1B3591460075EE4A /* Migrations Demo */ = { - isa = PBXGroup; - children = ( - B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */, - B5EE259A1B3EA4890000406B /* OrganismV3.swift */, - B5EE25861B36E2520000406B /* OrganismV2.swift */, - B5EE25841B36E23C0000406B /* OrganismV1.swift */, - B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */, - B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */, - B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */, - B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */, - B5125C131B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel */, - ); - path = "Migrations Demo"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - B54AAD481AF4D26E00848AE0 /* LegacyDemo */ = { - isa = PBXNativeTarget; - buildConfigurationList = B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "LegacyDemo" */; - buildPhases = ( - B54AAD451AF4D26E00848AE0 /* Sources */, - B54AAD461AF4D26E00848AE0 /* Frameworks */, - B54AAD471AF4D26E00848AE0 /* Resources */, - B5E89ACF1C52929C003B04A9 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = LegacyDemo; - productName = LegacyDemo; - productReference = B54AAD491AF4D26E00848AE0 /* LegacyDemo.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - B54AAD411AF4D26E00848AE0 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 1200; - ORGANIZATIONNAME = "John Rommel Estropia"; - TargetAttributes = { - B54AAD481AF4D26E00848AE0 = { - CreatedOnToolsVersion = 6.3; - DevelopmentTeam = 2JT32EJ5BH; - LastSwiftMigration = 0900; - }; - }; - }; - buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "LegacyDemo" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = B54AAD401AF4D26E00848AE0; - productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - B54AAD481AF4D26E00848AE0 /* LegacyDemo */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - B54AAD471AF4D26E00848AE0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B54AAD591AF4D26E00848AE0 /* Main.storyboard in Resources */, - B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */, - B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - B54AAD451AF4D26E00848AE0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */, - B5C37EE52357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift in Sources */, - B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */, - B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */, - B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */, - B52977DD1B120F3B003D50A5 /* TransactionsDemoViewController.swift in Sources */, - B52977E41B121635003D50A5 /* Place.swift in Sources */, - B569650C1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift in Sources */, - B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */, - B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */, - B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */, - B52977D91B120B80003D50A5 /* ObserversViewController.swift in Sources */, - B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */, - B5635D192357F9F700B80E6B /* CollectionViewDemoViewController.swift in Sources */, - B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */, - B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */, - B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */, - B54AAD521AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld in Sources */, - B5EE259B1B3EA4890000406B /* OrganismV3.swift in Sources */, - B503FAE11AFDC71700F90881 /* Palette.swift in Sources */, - B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */, - B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */, - B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */, - B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */, - B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */, - B5635D1B2357FA4B00B80E6B /* PaletteCollectionViewCell.swift in Sources */, - B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */, - B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */, - B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */, - B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */, - B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */, - B50132242344E24300FC238B /* SwiftUIView.swift in Sources */, - B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */, - B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - B54AAD571AF4D26E00848AE0 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - B54AAD581AF4D26E00848AE0 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - B54AAD5D1AF4D26E00848AE0 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - B54AAD6B1AF4D26E00848AE0 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - B54AAD6C1AF4D26E00848AE0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 5.0; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - B54AAD6E1AF4D26E00848AE0 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 2JT32EJ5BH; - INFOPLIST_FILE = LegacyDemo/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.legacydemo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - }; - name = Debug; - }; - B54AAD6F1AF4D26E00848AE0 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = 2JT32EJ5BH; - INFOPLIST_FILE = LegacyDemo/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.legacydemo; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "LegacyDemo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - B54AAD6B1AF4D26E00848AE0 /* Debug */, - B54AAD6C1AF4D26E00848AE0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - B54AAD6D1AF4D26E00848AE0 /* Build configuration list for PBXNativeTarget "LegacyDemo" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - B54AAD6E1AF4D26E00848AE0 /* Debug */, - B54AAD6F1AF4D26E00848AE0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - -/* Begin XCVersionGroup section */ - B54AAD501AF4D26E00848AE0 /* LegacyDemo.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */, - ); - currentVersion = B54AAD511AF4D26E00848AE0 /* LegacyDemo.xcdatamodel */; - path = LegacyDemo.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; - B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */, - ); - currentVersion = B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */; - path = StackSetupDemo.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; - B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */, - B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */, - B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */, - ); - currentVersion = B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */; - path = MigrationDemo.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ - }; - rootObject = B54AAD411AF4D26E00848AE0 /* Project object */; -} diff --git a/LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index c81ed91..0000000 --- a/LegacyDemo/LegacyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/LegacyDemo/LegacyDemo/AppDelegate.swift b/LegacyDemo/LegacyDemo/AppDelegate.swift deleted file mode 100644 index c52cf26..0000000 --- a/LegacyDemo/LegacyDemo/AppDelegate.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// AppDelegate.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/02. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - - -// MARK: - AppDelegate - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - - // MARK: UIApplicationDelegate - - var window: UIWindow? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { - - return true - } -} - diff --git a/LegacyDemo/LegacyDemo/Base.lproj/LaunchScreen.xib b/LegacyDemo/LegacyDemo/Base.lproj/LaunchScreen.xib deleted file mode 100644 index e53eb1b..0000000 --- a/LegacyDemo/LegacyDemo/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard b/LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard deleted file mode 100644 index c99974c..0000000 --- a/LegacyDemo/LegacyDemo/Base.lproj/Main.storyboard +++ /dev/null @@ -1,1182 +0,0 @@ - - - - - - - - - - - - AppleSDGothicNeo-Regular - - - HelveticaNeue - HelveticaNeue-Bold - - - HelveticaNeue-Light - HelveticaNeue-Thin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift deleted file mode 100644 index 5d8de68..0000000 --- a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift +++ /dev/null @@ -1,319 +0,0 @@ -// -// FetchingAndQueryingDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/12. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -private struct Static { - - static let timeZonesStack: DataStack = { - - let dataStack = DataStack() - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "TimeZoneDemo.sqlite", - configuration: "FetchingAndQueryingDemo", - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - _ = try? dataStack.perform( - synchronous: { (transaction) in - - try transaction.deleteAll(From()) - - for name in NSTimeZone.knownTimeZoneNames { - - let rawTimeZone = NSTimeZone(name: name)! - let cachedTimeZone = transaction.create(Into()) - - cachedTimeZone.name = rawTimeZone.name - cachedTimeZone.abbreviation = rawTimeZone.abbreviation ?? "" - cachedTimeZone.secondsFromGMT = Int32(rawTimeZone.secondsFromGMT) - cachedTimeZone.hasDaylightSavingTime = rawTimeZone.isDaylightSavingTime - cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset - } - } - ) - return dataStack - }() -} - - -// MARK: - FetchingAndQueryingDemoViewController - -class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSource, UITableViewDelegate { - - // MARK: UIViewController - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - if self.didAppearOnce { - - return - } - - self.didAppearOnce = true - - let alert = UIAlertController( - title: "Fetch and Query Demo", - message: "This demo shows how to execute fetches and queries.\n\nEach menu item executes and displays a preconfigured fetch/query.", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - } - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - - super.prepare(for: segue, sender: sender) - - if let indexPath = sender as? IndexPath { - - switch segue.destination { - - case let controller as FetchingResultsViewController: - let item = self.fetchingItems[indexPath.row] - controller.set(timeZones: item.fetch(), title: item.title) - - case let controller as QueryingResultsViewController: - let item = self.queryingItems[indexPath.row] - controller.set(value: item.query(), title: item.title) - - default: - break - } - } - } - - - // MARK: UITableViewDataSource - - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - - switch self.segmentedControl?.selectedSegmentIndex { - - case Section.fetching.rawValue?: - return self.fetchingItems.count - - case Section.querying.rawValue?: - return self.queryingItems.count - - default: - return 0 - } - } - - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - - let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell")! - - switch self.segmentedControl?.selectedSegmentIndex { - - case Section.fetching.rawValue?: - cell.textLabel?.text = self.fetchingItems[indexPath.row].title - - case Section.querying.rawValue?: - cell.textLabel?.text = self.queryingItems[indexPath.row].title - - default: - cell.textLabel?.text = nil - } - - return cell - } - - - // MARK: UITableViewDelegate - - func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - - tableView.deselectRow(at: indexPath, animated: true) - - switch self.segmentedControl?.selectedSegmentIndex { - - case Section.fetching.rawValue?: - self.performSegue(withIdentifier: "FetchingResultsViewController", sender: indexPath) - - case Section.querying.rawValue?: - self.performSegue(withIdentifier: "QueryingResultsViewController", sender: indexPath) - - default: - break - } - } - - - // MARK: Private - - private enum Section: Int { - - case fetching - case querying - } - - private let fetchingItems = [ - ( - title: "All Time Zones", - fetch: { () -> [TimeZone] in - - return try! Static.timeZonesStack.fetchAll( - From() - .orderBy(.ascending(\.name)) - ) - } - ), - ( - title: "Time Zones in Asia", - fetch: { () -> [TimeZone] in - - return try! Static.timeZonesStack.fetchAll( - From() - .where( - format: "%K BEGINSWITH[c] %@", - #keyPath(TimeZone.name), - "Asia" - ) - .orderBy(.ascending(\.secondsFromGMT)) - ) - } - ), - ( - title: "Time Zones in America and Europe", - fetch: { () -> [TimeZone] in - - return try! Static.timeZonesStack.fetchAll( - From() - .where( - format: "%K BEGINSWITH[c] %@ OR %K BEGINSWITH[c] %@", - #keyPath(TimeZone.name), - "America", - #keyPath(TimeZone.name), - "Europe" - ) - .orderBy(.ascending(\.secondsFromGMT)) - ) - } - ), - ( - title: "All Time Zones Except America", - fetch: { () -> [TimeZone] in - - return try! Static.timeZonesStack.fetchAll( - From() - .where( - format: "%K BEGINSWITH[c] %@", - #keyPath(TimeZone.name), - "America" - ) - .orderBy(.ascending(\.secondsFromGMT)) - ) - } - ), - ( - title: "Time Zones with Summer Time", - fetch: { () -> [TimeZone] in - - return try! Static.timeZonesStack.fetchAll( - From() - .where(\.hasDaylightSavingTime == true) - .orderBy(.ascending(\.name)) - ) - } - ) - ] - - private let queryingItems: [(title: String, query: () -> Any)] = [ - ( - title: "Number of Time Zones", - query: { () -> Any in - - return try! Static.timeZonesStack.queryValue( - From() - .select(NSNumber.self, .count(\.name)) - )! - } - ), - ( - title: "Abbreviation For Tokyo's Time Zone", - query: { () -> Any in - - return try! Static.timeZonesStack.queryValue( - From() - .select(String.self, .attribute(\.abbreviation)) - .where(format: "%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo") - )! - } - ), - ( - title: "All Abbreviations", - query: { () -> Any in - - return try! Static.timeZonesStack.queryAttributes( - From() - .select( - NSDictionary.self, - .attribute(\.name), - .attribute(\.abbreviation) - ) - .orderBy(.ascending(\.name)) - ) - } - ), - ( - title: "Number of Countries per Time Zone", - query: { () -> Any in - - return try! Static.timeZonesStack.queryAttributes( - From() - .select( - NSDictionary.self, - .count(\.abbreviation), - .attribute(\.abbreviation) - ) - .groupBy(\.abbreviation) - .orderBy( - .ascending(\.secondsFromGMT), - .ascending(\.name) - ) - ) - } - ), - ( - title: "Number of Countries with Summer Time", - query: { () -> Any in - - return try! Static.timeZonesStack.queryAttributes( - From() - .select( - NSDictionary.self, - .count(\.hasDaylightSavingTime, as: "numberOfCountries"), - .attribute(\.hasDaylightSavingTime) - ) - .groupBy(\.hasDaylightSavingTime) - .orderBy( - .descending(\.hasDaylightSavingTime), - .ascending(\.name) - ) - ) - } - ) - ] - - var didAppearOnce = false - - @IBOutlet dynamic weak var segmentedControl: UISegmentedControl? - @IBOutlet dynamic weak var tableView: UITableView? - - @IBAction dynamic func segmentedControlValueChanged(_ sender: AnyObject?) { - - self.tableView?.reloadData() - } -} diff --git a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift deleted file mode 100644 index 1e93e7f..0000000 --- a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/FetchingResultsViewController.swift +++ /dev/null @@ -1,68 +0,0 @@ -// -// FetchingResultsViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/17. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - -// MARK: - FetchingResultsViewController - -class FetchingResultsViewController: UITableViewController { - - // MARK: Public - - func set(timeZones: [TimeZone]?, title: String) { - - self.timeZones += timeZones ?? [] - self.sectionTitle = title - - self.tableView?.reloadData() - } - - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - self.tableView.estimatedRowHeight = 60 - self.tableView.rowHeight = UITableView.automaticDimension - } - - - // MARK: UITableViewDataSource - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - - return self.timeZones.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - - let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath) - - let timeZone = self.timeZones[indexPath.row] - cell.textLabel?.text = timeZone.name - cell.detailTextLabel?.text = timeZone.abbreviation - - return cell - } - - - // MARK: UITableViewDelegate - - override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - - return self.sectionTitle - } - - - // MARK: Private - - var timeZones = [TimeZone]() - var sectionTitle: String? -} diff --git a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift deleted file mode 100644 index 17a663e..0000000 --- a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/QueryingResultsViewController.swift +++ /dev/null @@ -1,88 +0,0 @@ -// -// QueryingResultsViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/17. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - -class QueryingResultsViewController: UITableViewController { - - // MARK: Public - - func set(value: Any?, title: String) { - - switch value { - - case (let array as [Any])?: - self.values = array.map { (item: Any) -> (title: String, detail: String) in - ( - title: String(describing: item), - detail: String(reflecting: type(of: item)) - ) - } - - case let item?: - self.values = [ - ( - title: String(describing: item), - detail: String(reflecting: type(of: item)) - ) - ] - - default: - self.values = [] - } - - self.sectionTitle = title - - self.tableView?.reloadData() - } - - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - self.tableView.estimatedRowHeight = 60 - self.tableView.rowHeight = UITableView.automaticDimension - } - - - // MARK: UITableViewDataSource - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - - return self.values.count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - - let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath) - - let value = self.values[indexPath.row] - - cell.textLabel?.text = value.title - cell.detailTextLabel?.text = value.detail - - return cell - } - - - // MARK: UITableViewDelegate - - override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - - return self.sectionTitle - } - - - // MARK: Private - - var values: [(title: String, detail: String)] = [] - var sectionTitle: String? -} diff --git a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift b/LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift deleted file mode 100644 index c112b69..0000000 --- a/LegacyDemo/LegacyDemo/Fetching and Querying Demo/TimeZone.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// TimeZone.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/15. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class TimeZone: NSManagedObject { - - @NSManaged var secondsFromGMT: Int32 - @NSManaged var abbreviation: String - @NSManaged var hasDaylightSavingTime: Bool - @NSManaged var daylightSavingTimeOffset: Double - @NSManaged var name: String - -} diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3092627..0000000 --- a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@3x-1.png", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-76.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-76@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Mask + Oval 1 + Oval 1 + Oval 1.png", - "scale" : "1x" - }, - { - "idiom" : "car", - "size" : "60x60", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "car", - "filename" : "Icon-60@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png deleted file mode 100644 index 1d1cc0c..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png deleted file mode 100644 index 74457f3..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x-1.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png deleted file mode 100644 index 74457f3..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png deleted file mode 100644 index bd400e9..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png deleted file mode 100644 index fd39f4a..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png b/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png deleted file mode 100644 index dfdb62a..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/LegacyDemo/LegacyDemo/Images.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json deleted file mode 100644 index 5066e8a..0000000 --- a/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "CoreStoreIcon@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png b/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png deleted file mode 100644 index dd28b0f..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/CoreStoreIcon.imageset/CoreStoreIcon@2x.png and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/Contents.json deleted file mode 100644 index 33a7451..0000000 --- a/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "first.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/first.pdf b/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/first.pdf deleted file mode 100644 index 47d911d..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/first.imageset/first.pdf and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/Contents.json b/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/Contents.json deleted file mode 100644 index 03bd9c9..0000000 --- a/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "second.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/second.pdf b/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/second.pdf deleted file mode 100644 index 401614e..0000000 Binary files a/LegacyDemo/LegacyDemo/Images.xcassets/second.imageset/second.pdf and /dev/null differ diff --git a/LegacyDemo/LegacyDemo/Info.plist b/LegacyDemo/LegacyDemo/Info.plist deleted file mode 100644 index e33343c..0000000 --- a/LegacyDemo/LegacyDemo/Info.plist +++ /dev/null @@ -1,56 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - CoreStore - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 6.3.2 - CFBundleSignature - ???? - CFBundleVersion - 4 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UIStatusBarStyle - UIStatusBarStyleLightContent - UIStatusBarTintParameters - - UINavigationBar - - Style - UIBarStyleDefault - Translucent - - - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UIUserInterfaceStyle - Light - UIViewControllerBasedStatusBarAppearance - - - diff --git a/LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents deleted file mode 100644 index 3b181e8..0000000 --- a/LegacyDemo/LegacyDemo/LegacyDemo.xcdatamodeld/LegacyDemo.xcdatamodel/contents +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift deleted file mode 100644 index 73ac494..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift +++ /dev/null @@ -1,168 +0,0 @@ -// -// CollectionViewDemoViewController.swift -// LegacyDemo -// -// Created by John Estropia on 2019/10/17. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -// MARK: - CollectionViewDemoViewController - -final class CollectionViewDemoViewController: UICollectionViewController { - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - let navigationItem = self.navigationItem - navigationItem.leftBarButtonItems = [ - self.editButtonItem, - UIBarButtonItem( - barButtonSystemItem: .trash, - target: self, - action: #selector(self.resetBarButtonItemTouched(_:)) - ) - ] - - let filterBarButton = UIBarButtonItem( - title: ColorsDemo.filter.rawValue, - style: .plain, - target: self, - action: #selector(self.filterBarButtonItemTouched(_:)) - ) - navigationItem.rightBarButtonItems = [ - UIBarButtonItem( - barButtonSystemItem: .add, - target: self, - action: #selector(self.addBarButtonItemTouched(_:)) - ), - UIBarButtonItem( - barButtonSystemItem: .refresh, - target: self, - action: #selector(self.shuffleBarButtonItemTouched(_:)) - ), - filterBarButton - ] - self.filterBarButton = filterBarButton - - self.dataSource = DiffableDataSource.CollectionViewAdapter( - collectionView: self.collectionView, - dataStack: ColorsDemo.stack, - cellProvider: { (collectionView, indexPath, palette) in - - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PaletteCollectionViewCell", for: indexPath) as! PaletteCollectionViewCell - cell.colorView?.backgroundColor = palette.color - cell.label?.text = palette.colorText - return cell - }, - supplementaryViewProvider: { (collectionView, kind, indexPath) in - - switch kind { - - case UICollectionView.elementKindSectionHeader: - let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "PaletteCollectionSectionHeaderView", for: indexPath) as! PaletteCollectionSectionHeaderView - view.label?.text = ColorsDemo.palettes.snapshot.sectionIDs[indexPath.section] - return view - - default: - return nil - } - } - ) - ColorsDemo.palettes.addObserver(self) { [weak self] (listPublisher) in - - guard let self = self else { - - return - } - self.filterBarButton?.title = ColorsDemo.filter.rawValue - self.dataSource?.apply(listPublisher.snapshot, animatingDifferences: true) - } - self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false) - } - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - - super.prepare(for: segue, sender: sender) - - switch (segue.identifier, segue.destination, sender) { - - case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as ObjectPublisher): - destinationViewController.setPalette(palette) - - default: - break - } - } - - - // MARK: UICollectionViewDelegate - - override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - - collectionView.deselectItem(at: indexPath, animated: true) - - self.performSegue( - withIdentifier: "ObjectObserverDemoViewController", - sender: ColorsDemo.palettes.snapshot[indexPath] - ) - } - - - // MARK: Private - - private var filterBarButton: UIBarButtonItem? - private var dataSource: DiffableDataSource.CollectionViewAdapter? - - deinit { - - ColorsDemo.palettes.removeObserver(self) - } - - @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - try transaction.deleteAll(From()) - }, - completion: { _ in } - ) - } - - @IBAction private dynamic func filterBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.filter = ColorsDemo.filter.next() - } - - @IBAction private dynamic func addBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - _ = transaction.create(Into()) - }, - completion: { _ in } - ) - } - - @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) { - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - for palette in try transaction.fetchAll(From()) { - - palette.hue = Palette.randomHue() - palette.colorName = nil - } - }, - completion: { _ in } - ) - } -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift deleted file mode 100644 index 4b488db..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ColorsDemo.swift +++ /dev/null @@ -1,88 +0,0 @@ -// -// ColorsDemo.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2019/10/17. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreStore - - -// MARK: - ColorsDemo - -struct ColorsDemo { - - enum Filter: String { - - case all = "All Colors" - case light = "Light Colors" - case dark = "Dark Colors" - - func next() -> Filter { - - switch self { - - case .all: return .light - case .light: return .dark - case .dark: return .all - } - } - - func whereClause() -> Where { - - switch self { - - case .all: return .init() - case .light: return (\Palette.$brightness >= 0.9) - case .dark: return (\Palette.$brightness <= 0.4) - } - } - } - - static var filter = Filter.all { - - didSet { - - try! self.palettes.refetch( - From() - .sectionBy(\.$colorName) - .where(self.filter.whereClause()) - .orderBy(.ascending(\.$hue)) - ) - } - } - - static let stack: DataStack = { - - let dataStack = DataStack( - CoreStoreSchema( - modelVersion: "ColorsDemo", - entities: [ - Entity("Palette"), - ], - versionLock: [ - "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f] - ] - ) - ) - - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "ColorsDemo.sqlite", - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - return dataStack - }() - - static let palettes: ListPublisher = { - - return ColorsDemo.stack.publishList( - From() - .sectionBy(\.$colorName) - .orderBy(.ascending(\.$hue)) - ) - }() -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift deleted file mode 100644 index ec0ba86..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ListObserverDemoViewController.swift +++ /dev/null @@ -1,181 +0,0 @@ -// -// ListObserverDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/02. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -// MARK: - ListObserverDemoViewController - -final class ListObserverDemoViewController: UITableViewController { - - // MARK: - EditableDataSource - - final class EditableDataSource: DiffableDataSource.TableViewAdapter { - - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { - - switch editingStyle { - - case .delete: - let palette = ColorsDemo.palettes.snapshot[indexPath] - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - transaction.delete(palette) - }, - completion: { _ in } - ) - - default: - break - } - } - } - - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - let navigationItem = self.navigationItem - navigationItem.leftBarButtonItems = [ - self.editButtonItem, - UIBarButtonItem( - barButtonSystemItem: .trash, - target: self, - action: #selector(self.resetBarButtonItemTouched(_:)) - ) - ] - - let filterBarButton = UIBarButtonItem( - title: ColorsDemo.filter.rawValue, - style: .plain, - target: self, - action: #selector(self.filterBarButtonItemTouched(_:)) - ) - navigationItem.rightBarButtonItems = [ - UIBarButtonItem( - barButtonSystemItem: .add, - target: self, - action: #selector(self.addBarButtonItemTouched(_:)) - ), - UIBarButtonItem( - barButtonSystemItem: .refresh, - target: self, - action: #selector(self.shuffleBarButtonItemTouched(_:)) - ), - filterBarButton - ] - self.filterBarButton = filterBarButton - - self.dataSource = EditableDataSource( - tableView: self.tableView, - dataStack: ColorsDemo.stack, - cellProvider: { (tableView, indexPath, palette) in - - let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell - cell.colorView?.backgroundColor = palette.color - cell.label?.text = palette.colorText - return cell - } - ) - ColorsDemo.palettes.addObserver(self) { [weak self] (listPublisher) in - - guard let self = self else { - - return - } - self.filterBarButton?.title = ColorsDemo.filter.rawValue - self.dataSource?.apply(listPublisher.snapshot, animatingDifferences: true) - } - self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false) - } - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - - super.prepare(for: segue, sender: sender) - - switch (segue.identifier, segue.destination, sender) { - - case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as ObjectPublisher): - destinationViewController.setPalette(palette) - - default: - break - } - } - - - // MARK: UITableViewDelegate - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - - tableView.deselectRow(at: indexPath, animated: true) - - self.performSegue( - withIdentifier: "ObjectObserverDemoViewController", - sender: ColorsDemo.palettes.snapshot[indexPath] - ) - } - - - // MARK: Private - - private var filterBarButton: UIBarButtonItem? - private var dataSource: DiffableDataSource.TableViewAdapter? - - deinit { - - ColorsDemo.palettes.removeObserver(self) - } - - @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - try transaction.deleteAll(From()) - }, - completion: { _ in } - ) - } - - @IBAction private dynamic func filterBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.filter = ColorsDemo.filter.next() - } - - @IBAction private dynamic func addBarButtonItemTouched(_ sender: AnyObject?) { - - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - _ = transaction.create(Into()) - }, - completion: { _ in } - ) - } - - @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) { - ColorsDemo.stack.perform( - asynchronous: { (transaction) in - - for palette in try transaction.fetchAll(From()) { - - palette.hue = Palette.randomHue() - palette.colorName = nil - } - }, - completion: { _ in } - ) - } -} - diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift deleted file mode 100644 index 0c8fd1a..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift +++ /dev/null @@ -1,192 +0,0 @@ -// -// ObjectObserverDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/06. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -// MARK: - ObjectObserverDemoViewController - -class ObjectObserverDemoViewController: UIViewController, ObjectObserver { - - func setPalette(_ newValue: O?) where O.ObjectType == Palette { - - guard self.monitor?.object?.objectID() != newValue?.objectID() else { - - return - } - if let newValue = newValue { - - self.monitor = newValue.asReadOnly(in: ColorsDemo.stack).map(ColorsDemo.stack.monitorObject(_:)) - } - else { - - self.monitor = nil - } - } - - - // MARK: NSObject - - deinit { - - self.monitor?.removeObserver(self) - } - - - // MARK: UIViewController - - required init?(coder aDecoder: NSCoder) { - - if let palette = try! ColorsDemo.stack.fetchOne(From().orderBy(.ascending(\.$hue))) { - - self.monitor = ColorsDemo.stack.monitorObject(palette) - } - else { - - _ = try? ColorsDemo.stack.perform( - synchronous: { (transaction) in - - _ = transaction.create(Into()) - } - ) - - let palette = try! ColorsDemo.stack.fetchOne(From().orderBy(.ascending(\.$hue)))! - self.monitor = ColorsDemo.stack.monitorObject(palette) - } - - super.init(coder: aDecoder) - } - - override func viewDidLoad() { - - super.viewDidLoad() - self.monitor?.addObserver(self) - - if let palette = self.monitor?.object { - - self.reloadPaletteInfo(palette, changedKeys: nil) - } - } - - - // MARK: ObjectObserver - - func objectMonitor(_ monitor: ObjectMonitor, didUpdateObject object: Palette, changedPersistentKeys: Set) { - - self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys) - } - - func objectMonitor(_ monitor: ObjectMonitor, didDeleteObject object: Palette) { - - self.navigationItem.rightBarButtonItem?.isEnabled = false - - self.colorNameLabel?.alpha = 0.3 - self.colorView?.alpha = 0.3 - - self.hsbLabel?.text = "Deleted" - self.hsbLabel?.textColor = UIColor.red - - self.hueSlider?.isEnabled = false - self.saturationSlider?.isEnabled = false - self.brightnessSlider?.isEnabled = false - } - - - // MARK: Private - - var monitor: ObjectMonitor? - - @IBOutlet weak var colorNameLabel: UILabel? - @IBOutlet weak var colorView: UIView? - @IBOutlet weak var hsbLabel: UILabel? - @IBOutlet weak var dateLabel: UILabel? - @IBOutlet weak var hueSlider: UISlider? - @IBOutlet weak var saturationSlider: UISlider? - @IBOutlet weak var brightnessSlider: UISlider? - - @IBAction dynamic func hueSliderValueDidChange(_ sender: AnyObject?) { - - let hue = self.hueSlider?.value ?? 0 - ColorsDemo.stack.perform( - asynchronous: { [weak self] (transaction) in - - if let palette = transaction.edit(self?.monitor?.object) { - - palette.hue = Int(hue) - } - }, - completion: { _ in } - ) - } - - @IBAction dynamic func saturationSliderValueDidChange(_ sender: AnyObject?) { - - let saturation = self.saturationSlider?.value ?? 0 - ColorsDemo.stack.perform( - asynchronous: { [weak self] (transaction) in - - if let palette = transaction.edit(self?.monitor?.object) { - - palette.saturation = saturation - } - }, - completion: { _ in } - ) - } - - @IBAction dynamic func brightnessSliderValueDidChange(_ sender: AnyObject?) { - - let brightness = self.brightnessSlider?.value ?? 0 - ColorsDemo.stack.perform( - asynchronous: { [weak self] (transaction) in - - if let palette = transaction.edit(self?.monitor?.object) { - - palette.brightness = brightness - } - }, - completion: { _ in } - ) - } - - @IBAction dynamic func deleteBarButtonTapped(_ sender: AnyObject?) { - - ColorsDemo.stack.perform( - asynchronous: { [weak self] (transaction) in - - transaction.delete(self?.monitor?.object) - }, - completion: { _ in } - ) - } - - func reloadPaletteInfo(_ palette: Palette, changedKeys: Set?) { - - self.colorNameLabel?.text = palette.colorName - - let color = palette.color - self.colorNameLabel?.textColor = color - self.colorView?.backgroundColor = color - - self.hsbLabel?.text = palette.colorText - - if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$hue)) == true { - - self.hueSlider?.value = Float(palette.hue) - } - if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$saturation)) == true { - - self.saturationSlider?.value = palette.saturation - } - if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$brightness)) == true { - - self.brightnessSlider?.value = palette.brightness - } - } -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift deleted file mode 100644 index e85627c..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/ObserversViewController.swift +++ /dev/null @@ -1,59 +0,0 @@ -// -// ObserversViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - - -// MARK: - ObserversViewController - -class ObserversViewController: UIViewController { - - // MARK: UIViewController - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - let alert = UIAlertController( - title: "Observers Demo", - message: "This demo shows how to observe changes to a list of objects. The top and bottom view controllers both observe a single shared \"ListMonitor\" instance.\n\nTap on a row to see how to observe changes made to a single object using a \"ObjectMonitor\".", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - } - - - // MARK: Private - - @IBOutlet private dynamic weak var toggleTopBarButtonItem: UIBarButtonItem? - @IBOutlet private dynamic weak var toggleBottomBarButtonItem: UIBarButtonItem? - @IBOutlet private dynamic weak var stackView: UIStackView? - @IBOutlet private dynamic weak var topContainerView: UIView? - @IBOutlet private dynamic weak var bottomContainerView: UIView? - - @IBAction private dynamic func toggleTopContainerView() { - - UIView.animate(withDuration: 0.2) { - - self.topContainerView!.isHidden.toggle() - } - self.toggleTopBarButtonItem!.isEnabled = !self.bottomContainerView!.isHidden - self.toggleBottomBarButtonItem!.isEnabled = !self.topContainerView!.isHidden - } - - @IBAction private dynamic func toggleBottomContainerView() { - - UIView.animate(withDuration: 0.2) { - - self.bottomContainerView!.isHidden.toggle() - } - self.toggleTopBarButtonItem!.isEnabled = !self.bottomContainerView!.isHidden - self.toggleBottomBarButtonItem!.isEnabled = !self.topContainerView!.isHidden - } -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift deleted file mode 100644 index bc3124e..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/Palette.swift +++ /dev/null @@ -1,86 +0,0 @@ -// -// Palette.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/05. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import UIKit -import CoreData -import CoreStore - - -// MARK: - Palette - -final class Palette: CoreStoreObject { - - @Field.Stored( - "hue", - dynamicInitialValue: { Palette.randomHue() } - ) - var hue: Int - - @Field.Stored("saturation") - var saturation: Float = 1 - - @Field.Stored( - "brightness", - dynamicInitialValue: { Palette.randomBrightness() } - ) - var brightness: Float - - @Field.Virtual( - "colorName", - customGetter: { object, field in - if let colorName = field.primitiveValue { - return colorName - } - let colorName: String - switch object.$hue.value { - case 0 ..< 20: colorName = "Lower Reds" - case 20 ..< 57: colorName = "Oranges and Browns" - case 57 ..< 90: colorName = "Yellow-Greens" - case 90 ..< 159: colorName = "Greens" - case 159 ..< 197: colorName = "Blue-Greens" - case 197 ..< 241: colorName = "Blues" - case 241 ..< 297: colorName = "Violets" - case 297 ..< 331: colorName = "Magentas" - case 331 ..< 360: colorName = "Upper Reds" - default: colorName = "" - } - field.primitiveValue = colorName - return colorName - } - ) - var colorName: String! - - static func randomHue() -> Int { - - return Int.random(in: 0 ..< 360) - } - - static func randomBrightness() -> Float { - - return (Float.random(in: 0 ..< 70) + 30) / 100.0 - } -} - -extension Palette { - - var color: UIColor { - - return UIColor( - hue: CGFloat(self.hue) / 360.0, - saturation: CGFloat(self.saturation), - brightness: CGFloat(self.brightness), - alpha: 1.0 - ) - } - - var colorText: String { - - return "H: \(self.hue)˚, S: \(round(self.saturation * 100.0))%, B: \(round(self.brightness * 100.0))%" - } -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift deleted file mode 100644 index ecf7166..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// PaletteCollectionSectionHeaderView.swift -// LegacyDemo -// -// Created by John Estropia on 2019/10/17. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -import UIKit - - -// MARK: - PaletteCollectionSectionHeaderView - -final class PaletteCollectionSectionHeaderView: UICollectionReusableView { - - @IBOutlet weak var label: UILabel? -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift deleted file mode 100644 index 2bf508f..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// PaletteCollectionViewCell.swift -// LegacyDemo -// -// Created by John Estropia on 2019/10/17. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -import UIKit - - -// MARK: - PaletteCollectionViewCell - -final class PaletteCollectionViewCell: UICollectionViewCell { - - @IBOutlet weak var colorView: UIView? - @IBOutlet weak var label: UILabel? -} diff --git a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift b/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift deleted file mode 100644 index 86b144d..0000000 --- a/LegacyDemo/LegacyDemo/List and Object Observers Demo/PaletteTableViewCell.swift +++ /dev/null @@ -1,18 +0,0 @@ -// -// PaletteTableViewCell.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/05. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - - -// MARK: - PaletteTableViewCell - -final class PaletteTableViewCell: UITableViewCell { - - @IBOutlet weak var colorView: UIView? - @IBOutlet weak var label: UILabel? -} diff --git a/LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift b/LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift deleted file mode 100644 index 2de764e..0000000 --- a/LegacyDemo/LegacyDemo/Loggers Demo/CustomLoggerViewController.swift +++ /dev/null @@ -1,126 +0,0 @@ -// -// CustomLoggerViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/05. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -// MARK: - CustomLoggerViewController - -class CustomLoggerViewController: UIViewController, CoreStoreLogger { - - // MARK: NSObject - - let dataStack = DataStack() - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - try! self.dataStack.addStorageAndWait(SQLiteStore(fileName: "emptyStore.sqlite")) - } - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - CoreStoreDefaults.logger = self - - let alert = UIAlertController( - title: "Logger Demo", - message: "This demo shows how to plug-in any logging framework to CoreStore.\n\nThe view controller implements CoreStoreLogger and appends all logs to the text view.", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - } - - override func viewDidDisappear(_ animated: Bool) { - - super.viewDidDisappear(animated) - - CoreStoreDefaults.logger = DefaultLogger() - } - - - // MARK: CoreStoreLogger - - func log(level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) { - - DispatchQueue.main.async { [weak self] in - - let levelString: String - switch level { - - case .trace: levelString = "Trace" - case .notice: levelString = "Notice" - case .warning: levelString = "Warning" - case .fatal: levelString = "Fatal" - } - self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ [Log:\(levelString)] \(message)\n\n") - } - } - - func log(error: CoreStoreError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) { - - DispatchQueue.main.async { [weak self] in - - self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ [Error] \(message): \(error)\n\n") - } - } - - func assert(_ condition: @autoclosure () -> Bool, message: @autoclosure () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString) { - - if condition() { - - return - } - - let messageString = message() - DispatchQueue.main.async { [weak self] in - - self?.textView?.insertText("\((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n ↪︎ [Assert] \(messageString)\n\n") - } - } - - - // MARK: Private - - @IBOutlet dynamic weak var textView: UITextView? - @IBOutlet dynamic weak var segmentedControl: UISegmentedControl? - - @IBAction dynamic func segmentedControlValueChanged(_ sender: AnyObject?) { - - switch self.segmentedControl?.selectedSegmentIndex { - - case 0?: - let request = NSFetchRequest() - Where(true).applyToFetchRequest(request) - Where(false).applyToFetchRequest(request) - - case 1?: - _ = try? dataStack.addStorageAndWait( - SQLiteStore( - fileName: "emptyStore.sqlite", - configuration: "invalidStore" - ) - ) - - case 2?: - DispatchQueue.global(qos: .background).async { - - _ = try! self.dataStack.fetchOne(From()) - } - - default: - return - } - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift deleted file mode 100644 index fc6a662..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/MigrationsDemoViewController.swift +++ /dev/null @@ -1,445 +0,0 @@ -// -// MigrationsDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -// MARK: - MigrationsDemoViewController - -class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewDataSource, UITableViewDelegate { - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - if let segmentedControl = self.segmentedControl { - - for (index, model) in self.models.enumerated() { - - segmentedControl.setTitle( - model.label, - forSegmentAt: index - ) - } - } - self.set(dataStack: nil, model: nil, scrollToSelection: false) - } - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - let alert = UIAlertController( - title: "Migrations Demo", - message: "This demo shows how to run progressive migrations and how to support multiple model versions in a single project.\n\nThe persistent store contains 10000 organisms, which gain/lose properties when the migration evolves/devolves them.\n\nYou can use the \"mutate\" button to change an organism's properties then migrate to a different model to see how its value gets affected.", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - - - let modelMetadata = withExtendedLifetime(DataStack(xcodeModelName: "MigrationDemo")) { - (dataStack: DataStack) -> ModelMetadata in - - let models = self.models - let migrations = try! dataStack.requiredMigrationsForStorage( - SQLiteStore(fileName: "MigrationDemo.sqlite") - ) - - guard let storeVersion = migrations.first?.sourceVersion else { - - return models.first! - } - for model in models { - - if model.schemaHistory.currentModelVersion == storeVersion { - - return model - } - } - - return models.first! - } - - self.selectModelVersion(modelMetadata) - } - - // MARK: ListObserver - - func listMonitorWillChange(_ monitor: ListMonitor) { } - - func listMonitorDidChange(_ monitor: ListMonitor) { - - if self.lastSelectedIndexPath == nil, - let numberOfObjectsInSection = self.listMonitor?.numberOfObjects(in: 0), - numberOfObjectsInSection > 0 { - - self.tableView?.reloadData() - self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: false) - } - else { - - self.updateDisplay(reloadData: true, scrollToSelection: true, animated: true) - } - } - - func listMonitorDidRefetch(_ monitor: ListMonitor) { - - self.listMonitorDidChange(monitor) - } - - // MARK: UITableViewDataSource - - @objc dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - - return self.listMonitor?.numberOfObjects(in: 0) ?? 0 - } - - @objc dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - - let cell = tableView.dequeueReusableCell(withIdentifier: "OrganismTableViewCell", for: indexPath) as! OrganismTableViewCell - - let dna = (self.listMonitor?[indexPath] as? OrganismProtocol)?.dna.description ?? "" - cell.dnaLabel?.text = "DNA: \(dna)" - cell.mutateButtonHandler = { [weak self] () -> Void in - - guard let `self` = self, - let dataStack = self.dataStack, - let organism = self.listMonitor?[indexPath] else { - - return - } - - self.setSelectedIndexPath(indexPath, scrollToSelection: false) - self.setEnabled(false) - dataStack.perform( - asynchronous: { (transaction) in - - let organism = transaction.edit(organism) as! OrganismProtocol - organism.mutate() - }, - completion: { [weak self] _ in - - self?.setEnabled(true) - } - ) - } - return cell - } - - - // MARK: UITableViewDelegate - - @objc dynamic func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - - self.setSelectedIndexPath(indexPath, scrollToSelection: false) - } - - - // MARK: Private - - private typealias ModelMetadata = (label: String, entityType: NSManagedObject.Type, schemaHistory: SchemaHistory) - - private let models: [ModelMetadata] = [ - ( - label: "Model V1", - entityType: OrganismV1.self, - schemaHistory: SchemaHistory( - XcodeDataModelSchema.from( - modelName: "MigrationDemo", - migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"] - ), - migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"] - ) - ), - ( - label: "Model V2", - entityType: OrganismV2.self, - schemaHistory: SchemaHistory( - XcodeDataModelSchema.from( - modelName: "MigrationDemo", - migrationChain: [ - "MigrationDemo": "MigrationDemoV2", - "MigrationDemoV3": "MigrationDemoV2" - ] - ), - migrationChain: [ - "MigrationDemo": "MigrationDemoV2", - "MigrationDemoV3": "MigrationDemoV2" - ] - ) - ), - ( - label: "Model V3", - entityType: OrganismV3.self, - schemaHistory: SchemaHistory( - XcodeDataModelSchema.from( - modelName: "MigrationDemo", - migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"] - ), - migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"] - ) - ) - ] - - private var _listMonitor: ListMonitor? - private var listMonitor: ListMonitor? { - - return self._listMonitor - } - - private var _dataStack: DataStack? - private var dataStack: DataStack? { - - return self._dataStack - } - - private var _lastSelectedIndexPath: IndexPath? - private var lastSelectedIndexPath: IndexPath? { - - return self._lastSelectedIndexPath - } - - private func setSelectedIndexPath(_ indexPath: IndexPath, scrollToSelection: Bool) { - - self._lastSelectedIndexPath = indexPath - self.updateDisplay(reloadData: false, scrollToSelection: scrollToSelection, animated: true) - } - - @IBOutlet private dynamic weak var headerContainer: UIView? - @IBOutlet private dynamic weak var titleLabel: UILabel? - @IBOutlet private dynamic weak var organismLabel: UILabel? - @IBOutlet private dynamic weak var segmentedControl: UISegmentedControl? - @IBOutlet private dynamic weak var progressView: UIProgressView? - @IBOutlet private dynamic weak var tableView: UITableView? - - @IBAction private dynamic func segmentedControlValueChanged(_ sender: AnyObject?) { - - guard let index = self.segmentedControl?.selectedSegmentIndex else { - - return - } - - self.selectModelVersion(self.models[index]) - } - - private func selectModelVersion(_ model: ModelMetadata) { - - if self.dataStack?.modelVersion == model.schemaHistory.currentModelVersion { - - return - } - - self.set(dataStack: nil, model: nil, scrollToSelection: false) // explicitly trigger NSPersistentStore cleanup by deallocating the stack - - let dataStack = DataStack(schemaHistory: model.schemaHistory) - - self.setEnabled(false) - let progress = dataStack.addStorage( - SQLiteStore( - fileName: "MigrationDemo.sqlite", - migrationMappingProviders: [ - CustomSchemaMappingProvider( - from: "MigrationDemoV3", - to: "MigrationDemoV2", - entityMappings: [ - .transformEntity( - sourceEntity: "Organism", - destinationEntity: "Organism", - transformer: { (source, createDestination) in - - let destination = createDestination() - destination.enumerateAttributes { (attribute, sourceAttribute) in - - if let sourceAttribute = sourceAttribute { - - destination[attribute] = source[sourceAttribute] - } - } - destination["numberOfFlippers"] = source["numberOfLimbs"] - } - ) - ] - ) - ] - ), - completion: { [weak self] (result) -> Void in - - guard let `self` = self else { - - return - } - - guard case .success = result else { - - self.setEnabled(true) - return - } - - self.set(dataStack: dataStack, model: model, scrollToSelection: true) - - let count = try! dataStack.queryValue( - From(model.entityType) - .select(Int.self, .count(#keyPath(OrganismV1.dna))))! - if count > 0 { - - self.setEnabled(true) - } - else { - - for i: Int64 in 0 ..< 20 { - - dataStack.perform( - asynchronous: { (transaction) in - - for j: Int64 in 0 ..< 500 { - - let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol - organism.dna = (i * 500) + j + 1 - organism.mutate() - } - }, - completion: { _ in } - ) - } - dataStack.perform( - asynchronous: { _ in }, - completion: { [weak self] _ in - - self?.setEnabled(true) - } - ) - } - } - ) - - if let progress = progress { - - progress.setProgressHandler { [weak self] (progress) -> Void in - - self?.reloadTableHeaderWithProgress(progress) - } - } - } - - private func setEnabled(_ enabled: Bool) { - - UIView.animate( - withDuration: 0.2, - delay: 0, - options: .beginFromCurrentState, - animations: { () -> Void in - - let navigationItem = self.navigationItem - navigationItem.leftBarButtonItem?.isEnabled = enabled - navigationItem.rightBarButtonItem?.isEnabled = enabled - navigationItem.hidesBackButton = !enabled - - self.segmentedControl?.isEnabled = enabled - - if let tableView = self.tableView { - - tableView.alpha = enabled ? 1.0 : 0.5 - tableView.isUserInteractionEnabled = enabled - } - }, - completion: nil - ) - } - - private func set(dataStack: DataStack?, model: ModelMetadata?, scrollToSelection: Bool) { - - if let dataStack = dataStack, let model = model { - - self.segmentedControl?.selectedSegmentIndex = self.models - .firstIndex( - where: { (arg) -> Bool in - - let (_, _, schemaHistory) = arg - return schemaHistory.currentModelVersion == model.schemaHistory.currentModelVersion - } - )! - - self._dataStack = dataStack - let listMonitor = dataStack.monitorList( - From(model.entityType), - OrderBy(.descending(#keyPath(OrganismV1.dna))) - ) - listMonitor.addObserver(self) - self._listMonitor = listMonitor - - if self.lastSelectedIndexPath == nil { - - if listMonitor.numberOfObjects(in: 0) > 0 { - - self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: true) - } - } - } - else { - - self.segmentedControl?.selectedSegmentIndex = UISegmentedControl.noSegment - self._listMonitor = nil - self._dataStack = nil - } - - self.updateDisplay(reloadData: true, scrollToSelection: scrollToSelection, animated: false) - } - - private func reloadTableHeaderWithProgress(_ progress: Progress) { - - self.progressView?.setProgress(Float(progress.fractionCompleted), animated: true) - self.titleLabel?.text = "Migrating: \(progress.localizedDescription ?? "")" - self.organismLabel?.text = "Progressive step \(progress.localizedAdditionalDescription ?? "")" - } - - private func updateDisplay(reloadData: Bool, scrollToSelection: Bool, animated: Bool) { - - var lines = [String]() - var organismType = "" - if let indexPath = self.lastSelectedIndexPath, let organism = self.listMonitor?[indexPath] { - - for property in organism.entity.properties { - - let value = organism.value(forKey: property.name) ?? NSNull() - lines.append("\(property.name): \(value)") - } - organismType = organism.entity.managedObjectClassName - } - - self.titleLabel?.text = organismType - self.organismLabel?.text = lines.joined(separator: "\n") - self.progressView?.progress = 0 - - self.headerContainer?.setNeedsLayout() - - guard let tableView = self.tableView else { - - return - } - - if reloadData { - - tableView.reloadData() - } - - tableView.layoutIfNeeded() - - if let indexPath = self.lastSelectedIndexPath, - indexPath.row < tableView.numberOfRows(inSection: 0) { - - tableView.selectRow(at: indexPath, - animated: scrollToSelection && animated, - scrollPosition: scrollToSelection ? .middle : .none - ) - } - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion b/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion deleted file mode 100644 index 0c67376..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents deleted file mode 100644 index 34afc82..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift deleted file mode 100644 index d672fed..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismProtocol.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// OrganismProtocol.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation - -protocol OrganismProtocol: AnyObject { - - var dna: Int64 { get set } - - func mutate() -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift deleted file mode 100644 index 356e8af..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismTableViewCell.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// OrganismTableViewCell.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/07/12. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit - -class OrganismTableViewCell: UITableViewCell { - - @IBOutlet weak dynamic var dnaLabel: UILabel? - @IBOutlet weak dynamic var mutateButton: UIButton? - - var mutateButtonHandler: (() -> Void)? - - @IBAction dynamic func mutateButtonTouchUpInside(_ sender: UIButton?) { - - self.mutateButtonHandler?() - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift deleted file mode 100644 index ea96d24..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV1.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// OrganismV1.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class OrganismV1: NSManagedObject, OrganismProtocol { - - @NSManaged var dna: Int64 - @NSManaged var hasHead: Bool - @NSManaged var hasTail: Bool - - // MARK: OrganismProtocol - - func mutate() { - - self.hasHead = arc4random_uniform(2) == 1 - self.hasTail = arc4random_uniform(2) == 1 - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift deleted file mode 100644 index 931fcab..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// OrganismV2.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class OrganismV2: NSManagedObject, OrganismProtocol { - - @NSManaged var dna: Int64 - @NSManaged var hasHead: Bool - @NSManaged var hasTail: Bool - @NSManaged var numberOfFlippers: Int32 - - // MARK: OrganismProtocol - - func mutate() { - - self.hasHead = arc4random_uniform(2) == 1 - self.hasTail = arc4random_uniform(2) == 1 - self.numberOfFlippers = Int32(arc4random_uniform(9) / 2 * 2) - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml deleted file mode 100644 index 80e10b6..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - 134481920 - C1A5998D-0F2D-40D2-8299-2B2804420D2B - 109 - - - - NSPersistenceFrameworkVersion - 526 - NSStoreModelVersionHashes - - XDDevAttributeMapping - - 0plcXXRN7XHKl5CcF+fwriFmUpON3ZtcI/AfK748aWc= - - XDDevEntityMapping - - qeN1Ym3TkWN1G6dU9RfX6Kd2ccEvcDVWHpd3LpLgboI= - - XDDevMappingModel - - EqtMzvRnVZWkXwBHu4VeVGy8UyoOe+bi67KC79kphlQ= - - XDDevPropertyMapping - - XN33V44TTGY4JETlMoOB5yyTKxB+u4slvDIinv0rtGA= - - XDDevRelationshipMapping - - akYY9LhehVA/mCb4ATLWuI9XGLcjpm14wWL1oEBtIcs= - - - NSStoreModelVersionHashesVersion - 3 - NSStoreModelVersionIdentifiers - - - - - - - - - dna - - - - CoreStoreDemo.OrganismV2ToV3MigrationPolicy - Organism - Undefined - 1 - Organism - 1 - - - - - - numberOfLimbs - - - - hasVertebrae - - - - hasHead - - - - hasTail - - - - CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel - YnBsaXN0MDDUAAEAAgADAAQABQAGBqAGoVgkdmVyc2lvblgkb2JqZWN0c1kkYXJjaGl2ZXJUJHRv -cBIAAYagrxCtAAcACAAXADMANAA1AD0APgBZAFoAWwBhAGIAbgCCAIMAhACFAIYAhwCIAIkAigCjAKYArQCzAMIA0QDgAOMAWADzAQIBBgEKARkBHwEgASgBNwE4AUEBTQFOAU8BUAFRAWYBZwFvAXABcQF9AZEBkgGTAZQBlQGWAZcBmAGZAagBtwHGAcoB2QHoAekB+AIHAhYCIgI0AjUCNgI3AjgCOQI6AjsCSgJZAmgCdwJ4AocClgKlAq0CwgLDAssC1wLrAvoDCQMYAxwDKwM6A0kDWANnA3MDhQOUA6MDsgPBA8ID0QPgA+8EBAQFBA0EGQQtBDwESwRaBF4EbQR8BIsEmgSpBLUExwTWBNcE5gT1BQQFBQUUBSMFMgVHBUgFUAVcBXAFfwWOBZ0FoQWwBb8FzgXdBewF+AYKBhkGKAY3BkYGVQZkBnMGdAZ3BoAGhAaIBowGlAaXBpsGnFUkbnVsbNcACQAKAAsADAANAA4ADwAQABEAEgATABQAEwAWXxAPX3hkX3Jvb3RQYWNrYWdlViRjbGFzc1xfeGRfY29tbWVudHNfEBBfeGRfbW9kZWxNYW5hZ2VyXxAVX2NvbmZpZ3VyYXRpb25zQnlOYW1lXV94ZF9tb2RlbE5hbWVfEBdfbW9kZWxWZXJzaW9uSWRlbnRpZmllcoACgKyAqYAAgKqAAICr3gAYABkAGgAbABwAHQAeAAoAHwAgACEAIgAjACQAJQAmACcAKAAlABMAKwAsAC0ALgAvACUAJQATXxAcWERCdWNrZXRGb3JDbGFzc2Vzd2FzRW5jb2RlZF8QGlhEQnVja2V0Rm9yUGFja2FnZXNzdG9yYWdlXxAcWERCdWNrZXRGb3JJbnRlcmZhY2Vzc3RvcmFnZV8QD194ZF9vd25pbmdNb2RlbF8QHVhEQnVja2V0Rm9yUGFja2FnZXN3YXNFbmNvZGVkVl9vd25lcl8QG1hEQnVja2V0Rm9yRGF0YVR5cGVzc3RvcmFnZVtfdmlzaWJpbGl0eV8QGVhEQnVja2V0Rm9yQ2xhc3Nlc3N0b3JhZ2VVX25hbWVfEB9YREJ1Y2tldEZvckludGVyZmFjZXN3YXNFbmNvZGVkXxAeWERCdWNrZXRGb3JEYXRhVHlwZXN3YXNFbmNvZGVkXxAQX3VuaXF1ZUVsZW1lbnRJRIAEgKeApYABgASAAICmgKgQAIAFgAOABIAEgABQU1lFU9MANgA3AAoAOAA6ADxXTlMua2V5c1pOUy5vYmplY3RzoQA5gAahADuAB4AiWE9yZ2FuaXNt3xAQAD8AQABBAEIAHQBDAEQAHwBFAEYACgAhAEcASAAkAEkASgBLACUAJQAQAE8AUAAtACUASgBTADkASgBWAFcAWF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzc3RvcmFnZV8QIFhEQnVja2V0Rm9yU3RlcmVvdHlwZXN3YXNFbmNvZGVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAdWERCdWNrZXRGb3JTdGVyZW90eXBlc3N0b3JhZ2VfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc2R1cGxpY2F0ZXNfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc3dhc0VuY29kZWRfEB1YREJ1Y2tldEZvclN0ZXJlb3R5cGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zc3RvcmFnZVtfaXNBYnN0cmFjdIAJgCqABIAEgAKACoCigASACYCkgAaACYCjgAgIEiJt3CdXb3JkZXJlZNMANgA3AAoAXABeADyhAF2AC6EAX4AMgCJeWERfUFN0ZXJlb3R5cGXZAB0AIQBjAAoAJABkAB8ASQBlADsAXQBKAGkAEwAlAC0AWABtXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNvcmRlcmVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNzdG9yYWdlgAeAC4AJgCmAAIAECIAN0wA2ADcACgBvAHgAPKgAcABxAHIAcwB0AHUAdgB3gA6AD4AQgBGAEoATgBSAFagAeQB6AHsAfAB9AH4AfwCAgBaAGoAbgByAHoAggCOAJ4AiXxATWERQTUNvbXBvdW5kSW5kZXhlc18QEFhEX1BTS19lbGVtZW50SURfEBpYRF9QU0tfdmVyc2lv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ExUTFxMYEz0TYROIE6wTrhOwE7ITtBO2E7gTuRO7E8gT1xPZE9sT3RPfE+ET4xPlE/QT9hP4E/oT/BP+FAAUAhQEFCQUTxRpFIIUnBS8FN8VHhUgFSIVJBUmFScVKBUpFSoVLBUuFS8VMBUyFTMVchV0FXYVeBV6FXsVfBV9FX4VgBWCFYMVhBWGFYcVxhXIFcoVzBXOFc8V0BXRFdIV1BXWFdcV2BXaFdsWGhYcFh4WIBYiFiMWJBYlFiYWKBYqFisWLBYuFi8WMhZxFnMWdRZ3FnkWehZ7FnwWfRZ/FoEWghaDFoUWhhbFFscWyRbLFs0WzhbPFtAW0RbTFtUW1hbXFtkW2hcZFxsXHRcfFyEXIhcjFyQXJRcnFykXKhcrFy0XLhc3F0UXUhdgF20XgBeXF6kX9BgXGDcYVxhZGFsYXRhfGGEYYhhjGGUYZhhoGGkYaxhtGG4YbxhxGHIYdxiEGIkYixiNGJIYlBiWGJgYvRjhGQgZLBkuGTAZMhk0GTYZOBk5GTsZSBlZGVsZXRlfGWEZYxllGWcZaRl6GXwZfhmAGYIZhBmGGYgZihmMGcsZzRnPGdEZ0xnUGdUZ1hnXGdkZ2xncGd0Z3xngGh8aIRojGiUaJxooGikaKhorGi0aLxowGjEaMxo0GnMadRp3Gnkaexp8Gn0afhp/GoEagxqEGoUahxqIGpUalhqXGpka2BraGtwa3hrgGuEa4hrjGuQa5hroGuka6hrsGu0bLBsuGzAbMhs0GzUbNhs3GzgbOhs8Gz0bPhtAG0EbgBuCG4QbhhuIG4kbihuLG4wbjhuQG5EbkhuUG5Ub1BvWG9gb2hvcG90b3hvfG+Ab4hvkG+Ub5hvoG+kcKBwqHCwcLhwwHDEcMhwzHDQcNhw4HDkcOhw8HD0cYhyGHK0c0RzTHNUc1xzZHNsc3RzeHOAc7Rz8HP4dAB0CHQQdBh0IHQodGR0bHR0dHx0hHSMdJR0nHSkdaB1qHWwdbh1wHXEdch1zHXQddh14HXkdeh18HX0dvB2+HcAdwh3EHcUdxh3HHcgdyh3MHc0dzh3QHdEeEB4SHhQeFh4YHhkeGh4bHhweHh4gHiEeIh4kHiUeZB5mHmgeah5sHm0ebh5vHnAech50HnUedh54HnkefB67Hr0evx7BHsMexB7FHsYexx7JHssezB7NHs8e0B8PHxEfEx8VHxcfGB8ZHxofGx8dHx8fIB8hHyMfJB9jH2UfZx9pH2sfbB9tH24fbx9xH3MfdB91H3cfeB/DH+YgBiAmICggKiAsIC4gMCAxIDIgNCA1IDcgOCA6IDwgPSA+IEAgQSBGIFMgWCBaIFwgYSBjIGUgZyCMILAg1yD7IP0g/yEBIQMhBSEHIQghCiEXISghKiEsIS4hMCEyITQhNiE4IUkhSyFNIU8hUSFTIVUhVyFZIVshmiGcIZ4hoCGiIaMhpCGlIaYhqCGqIashrCGuIa8h7iHwIfIh9CH2Ifch+CH5Ifoh/CH+If8iACICIgMiQiJEIkYiSCJKIksiTCJNIk4iUCJSIlMiVCJWIlciZCJlImYiaCKnIqkiqyKtIq8isCKxIrIisyK1IrciuCK5IrsivCL7Iv0i/yMBIwMjBCMFIwYjByMJIwsjDCMNIw8jECNPI1EjUyNVI1cjWCNZI1ojWyNdI18jYCNhI2MjZCOjI6UjpyOpI6sjrCOtI64jryOxI7MjtCO1I7cjuCP3I/kj+yP9I/8kACQBJAIkAyQFJAckCCQJJAskDCQxJFUkfCSgJKIkpCSmJKgkqiSsJK0kryS8JMskzSTPJNEk0yTVJNck2SToJOok7CTuJPAk8iT0JPYk+CU3JTklOyU9JT8lQCVBJUIlQyVFJUclSCVJJUslTCVOJY0ljyWRJZMllSWWJZclmCWZJZslnSWeJZ8loSWiJeEl4yXlJecl6SXqJesl7CXtJe8l8SXyJfMl9SX2JjUmNyY5JjsmPSY+Jj8mQCZBJkMmRSZGJkcmSSZKJkwmiyaNJo8mkSaTJpQmlSaWJpcmmSabJpwmnSafJqAm3ybhJuMm5SbnJugm6SbqJusm7SbvJvAm8SbzJvQnMyc1JzcnOSc7JzwnPSc+Jz8nQSdDJ0QnRSdHJ0gnkye2J9Yn9if4J/on/Cf+KAAoASgCKAQoBSgHKAgoCigMKA0oDigQKBEoFigjKCgoKigsKDEoMyg1KDcoXCiAKKcoyyjNKM8o0SjTKNUo1yjYKNoo5yj4KPoo/Cj+KQApAikEKQYpCCkZKRspHSkfKSEpIyklKScpKSkrKWopbCluKXApcilzKXQpdSl2KXgpeil7KXwpfil/Kb4pwCnCKcQpxinHKcgpySnKKcwpzinPKdAp0inTKhIqFCoWKhgqGiobKhwqHSoeKiAqIiojKiQqJionKjQqNSo2Kjgqdyp5KnsqfSp/KoAqgSqCKoMqhSqHKogqiSqLKowqyyrNKs8q0SrTKtQq1SrWKtcq2SrbKtwq3SrfKuArHyshKyMrJSsnKygrKSsqKysrLSsvKzArMSszKzQrcyt1K3creSt7K3wrfSt+K38rgSuDK4QrhSuHK4grxyvJK8srzSvPK9Ar0SvSK9Mr1SvXK9gr2SvbK9wsASwlLEwscCxyLHQsdix4LHosfCx9LH8sjCybLJ0snyyhLKMspSynLKksuCy6LLwsvizALMIsxCzGLMgtBy0JLQstDS0PLRAtES0SLRMtFS0XLRgtGS0bLRwtWy1dLV8tYS1jLWQtZS1mLWctaS1rLWwtbS1vLXAtry2xLbMttS23LbgtuS26LbstvS2/LcAtwS3DLcQuAy4FLgcuCS4LLgwuDS4OLg8uES4TLhQuFS4XLhguVy5ZLlsuXS5fLmAuYS5iLmMuZS5nLmguaS5rLmwuqy6tLq8usS6zLrQutS62LrcuuS67LrwuvS6/LsAu/y8BLwMvBS8HLwgvCS8KLwsvDS8PLxAvES8TLxQvHy8oLykvKy80Lz8vTi9ZL2cvfC+QL6cvuS/GL8cvyC/KL9cv2C/ZL9sv6C/pL+ov7C/1MAQwETAgMDIwRjBdMG8weDB5MHswiDCJMIowjDCNMJYwoDCnMK8wwTDGMMsAAAAAAAACAgAAAAAAAAakAAAAAAAAAAAAAAAAAAAwzQ== - - CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel - YnBsaXN0MDDUAAEAAgADAAQABQAGB+QH5VgkdmVyc2lvblgkb2JqZWN0c1kkYXJjaGl2ZXJUJHRv -cBIAAYagrxDFAAcACAAXADMANAA1AD0APgBZAFoAWwBhAGIAbgCCAIMAhACFAIYAhwCIAIkAigCjAKYArQCzAMIA0QDgAOMAWADzAQIBBgEKARkBHwEgASgBNwE4AUEBTwFQAVEBUgFTAVQBaQFqAXIBcwF0AYABlAGVAZYBlwGYAZkBmgGbAZwBqwG6AckBzQHcAesB+gIJAhgCJAI2AjcCOAI5AjoCOwI8Aj0CTAJNAlwCawJ6AnsCigKZAqgCsALFAsYCzgLaAu4C/QMMAxsDHwMuAz0DTANbA2oDdgOIA5cDpgO1A8QDxQPUA+MD8gQHBAgEEAQcBDAEPwROBF0EYQRwBH8EgASPBJ4ErQS5BMsE2gTpBPgFBwUIBRcFJgU1BUoFSwVTBV8FcwWCBZEFoAWkBbMFwgXRBeAF7wX7Bg0GHAYrBjoGSQZYBmcGdgaLBowGlAagBrQGwwbSBuEG5Qb0BwMHEgchBzAHPAdOB10HbAd7B4oHmQeoB7cHuAe7B8QHyAfMB9AH2AfbB98H4FUkbnVsbNcACQAKAAsADAANAA4ADwAQABEAEgATABQAEwAWXxAPX3hkX3Jvb3RQYWNrYWdlViRjbGFzc1xfeGRfY29tbWVudHNfEBBfeGRfbW9kZWxNYW5hZ2VyXxAVX2NvbmZpZ3VyYXRpb25zQnlOYW1lXV94ZF9tb2RlbE5hbWVfEBdfbW9kZWxWZXJzaW9uSWRlbnRpZmllcoACgMSAwYAAgMKAAIDD3gAYABkAGgAbABwAHQAeAAoAHwAgACEAIgAjACQAJQAmACcAKAAlABMAKwAsAC0ALgAvACUAJQATXxAcWERCdWNrZXRGb3JDbGFzc2Vzd2FzRW5jb2RlZF8QGlhEQnVja2V0Rm9yUGFja2FnZXNzdG9yYWdlXxAcWERCdWNrZXRGb3JJbnRlcmZhY2Vzc3RvcmFnZV8QD194ZF9vd25pbmdNb2RlbF8QHVhEQnVja2V0Rm9yUGFja2FnZXN3YXNFbmNvZGVkVl9vd25lcl8QG1hEQnVja2V0Rm9yRGF0YVR5cGVzc3RvcmFnZVtfdmlzaWJpbGl0eV8QGVhEQnVja2V0Rm9yQ2xhc3Nlc3N0b3JhZ2VVX25hbWVfEB9YREJ1Y2tldEZvckludGVyZmFjZXN3YXNFbmNvZGVkXxAeWERCdWNrZXRGb3JEYXRhVHlwZXN3YXNFbmNvZGVkXxAQX3VuaXF1ZUVsZW1lbnRJRIAEgL+AvYABgASAAIC+gMAQAIAFgAOABIAEgABQU1lFU9MANgA3AAoAOAA6ADxXTlMua2V5c1pOUy5vYmplY3RzoQA5gAahADuAB4AiWE9yZ2FuaXNt3xAQAD8AQABBAEIAHQBDAEQAHwBFAEYACgAhAEcASAAkAEkASgBLACUAJQAQAE8AUAAtACUASgBTADkASgBWAFcAWF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzc3RvcmFnZV8QIFhEQnVja2V0Rm9yU3RlcmVvdHlwZXN3YXNFbmNvZGVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAdWERCdWNrZXRGb3JTdGVyZW90eXBlc3N0b3JhZ2VfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc2R1cGxpY2F0ZXNfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc3dhc0VuY29kZWRfEB1YREJ1Y2tldEZvclN0ZXJlb3R5cGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zc3RvcmFnZVtfaXNBYnN0cmFjdIAJgCqABIAEgAKACoC6gASACYC8gAaACYC7gAgIEu7HTMhXb3JkZXJlZNMANgA3AAoAXABeADyhAF2AC6EAX4AMgCJeWERfUFN0ZXJlb3R5cGXZAB0AIQBjAAoAJABkAB8ASQBlADsAXQBKAGkAEwAlAC0AWABtXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNvcmRlcmVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNzdG9yYWdlgAeAC4AJgCmAAIAECIAN0wA2ADcACgBvAHgAPKgAcABxAHIAcwB0AHUAdgB3gA6AD4AQgBGAEoATgBSAFagAeQB6AHsAfAB9AH4AfwCAgBaAGoAbgByAHoAggCOAJ4AiXxATWERQTUNv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ACQAlAATABMAEwaSAFgAWABYAC0AWACdAiYAWABYABMAWIAAgACAAICxCAgICIAZgEoICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATAOUAEwaSAFgAWABYAC0AWACdAicAWABYABMAWIAAgB+AAICxCAgICIAZgEsICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATABMAEwaSAFgAWABYAC0AWACdAigAWABYABMAWIAAgACAAICxCAgICIAZgEwICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATA7cAEwaSAFgAWABYAC0AWACdAikAWABYABMAWIAAgG+AAICxCAgICIAZgE0ICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATABMAEwaSAFgAWABYAC0AWACdAioAWABYABMAWIAAgACAAICxCAgICIAZgE4ICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATABMAEwaSAFgAWABYAC0AWACdAisAWABYABMAWIAAgACAAICxCAgICIAZgE8ICIAACN8QDwCLAIwAjQAdAI4AjwCQAB8AkQAKACEAkgCTACQAlAATABMAEwaSAFgAWABYAC0AWACdAiwAWABYABMAWIAAgACAAICxCAgICIAZgFAICIAACFpkdXBsaWNhdGVz0gA3AAoHuQCloIAY0gCnAKgHvAe9WlhEUE1FbnRpdHmnB74HvwfAB8EHwgfDAKxaWERQTUVudGl0eV1YRFVNTENsYXNzSW1wXxASWERVTUxDbGFzc2lmaWVySW1wXxARWERVTUxOYW1lc3BhY2VJbXBfEBRYRFVNTE5hbWVkRWxlbWVudEltcF8QD1hEVU1MRWxlbWVudEltcNMANgA3AAoHxQfGADygoIAi0wA2ADcACgfJB8oAPKCggCLTADYANwAKB80HzgA8oKCAItIApwCoB9EH0l5YRE1vZGVsUGFja2FnZaYH0wfUB9UH1gfXAKxeWERNb2RlbFBhY2thZ2VfEA9YRFVNTFBhY2thZ2VJbXBfEBFYRFVNTE5hbWVzcGFjZUltcF8QFFhEVU1MTmFtZWRFbGVtZW50SW1wXxAPWERVTUxFbGVtZW50SW1w0gA3AAoH2QCloIAY0wA2ADcACgfcB90APKCggCJQ0gCnAKgH4QfiWVhEUE1Nb2RlbKMH4QfjAKxXWERNb2RlbF8QD05TS2V5ZWRBcmNoaXZlctEH5gAoVHJvb3SAAQAIABkAIgArADUAOgA/AcwB0gHvAgECCAIVAigCQAJOAmgCagJsAm4CcAJyAnQCdgKvAs4C6wMKAxwDPANDA2EDbQOJA48DsQPSA+UD5wPpA+sD7QPvA/ED8wP1A/cD+QP7A/0D/wQBBAIEBgQTBBsEJgQpBCsELgQwBDIEOwR+BKIExgTpBRAFMAVXBX4FngXCBeYF8gX0BfYF+AX6BfwF/gYABgIGBAYGBggGCgYMBg4GDwYUBhwGKQYsBi4GMQYzBjUGRAZpBo0GtAbYBtoG3AbeBuAG4gbkBuUG5wb0BwUHBwcJBwsHDQcPBxEHEwcVByYHKAcqBywHLgcwBzIHNAc2BzgHTgdhB34HmgeuB8AH1gfvCC4INAg9CEoIVghgCGoIdQiACI0IlQiXCJkImwidCJ4InwigCKEIowilCKYIpwipCKoIswi0CLYIvwjKCNMI4gjpCPEI+gkDCRYJHwkyCUkJWwmaCZwJngmgCaIJowmkCaUJpgmoCaoJqwmsCa4JrwnuCfAJ8gn0CfYJ9wn4CfkJ+gn8Cf4J/woACgIKAwpCCkQKRgpICkoKSwpMCk0KTgpQClIKUwpUClYKVwpgCmEKYwqiCqQKpgqoCqoKqwqsCq0KrgqwCrIKswq0CrYKtwq4CvcK+Qr7Cv0K/wsACwELAgsDCwULBwsICwkLCwsMCxkLGgsbCx0LJgs8C0MLUAuPC5ELkwuVC5cLmAuZC5oLmwudC58LoAuhC6MLpAu9C78LwQvDC8QLxgvdC+YL9AwBDA8MJAw4DE8MYQygDKIMpAymDKgMqQyqDKsMrAyuDLAMsQyyDLQMtQzQDNkM7gz9DRINIA01DUkNYA1yDX8Nig2MDY4NkA2SDZQNnw2hDaMNpQ2nDakNqw25DcYNyg3SDdoOJQ5IDmgOiA6KDowOjg6QDpIOkw6UDpYOlw6ZDpoOnA6eDp8OoA6iDqMOqA61DroOvA6+DsMOxQ7HDskO3g7zDxgPPA9jD4cPiQ+LD40Pjw+RD5MPlA+WD6MPtA+2D7gPug+8D74PwA/CD8QP1Q/XD9kP2w/dD98P4Q/jD+UP5xAFECMQNhBKEF8QfBCQEKYQ5RDnEOkQ6xDtEO4Q7xDwEPEQ8xD1EPYQ9xD5EPoRORE7ET0RPxFBEUIRQxFEEUURRxFJEUoRSxFNEU4RjRGPEZERkxGVEZYRlxGYEZkRmxGdEZ4RnxGhEaIRrxGwEbERsxHyEfQR9hH4EfoR+xH8Ef0R/hIAEgISAxIEEgYSBxJGEkgSShJMEk4STxJQElESUhJUElYSVxJYEloSWxKaEpwSnhKgEqISoxKkEqUSphKoEqoSqxKsEq4SrxLuEvAS8hL0EvYS9xL4EvkS+hL8Ev4S/xMAEwITAxNCE0QTRhNIE0oTSxNME00TThNQE1ITUxNUE1YTVxN8E6ATxxPrE+0T7xPxE/MT9RP3E/gT+hQHFBYUGBQaFBwUHhQgFCIUJBQzFDUUNxQ5FDsUPRQ/FEEUQxRjFI4UqBTBFNsU+xUeFV0VXxVhFWMVZRVmFWcVaBVpFWsVbRVuFW8VcRVyFXQVsxW1FbcVuRW7FbwVvRW+Fb8VwRXDFcQVxRXHFcgWBxYJFgsWDRYPFhAWERYSFhMWFRYXFhgWGRYbFhwWWxZdFl8WYRZjFmQWZRZmFmcWaRZrFmwWbRZvFnAWchaxFrMWtRa3FrkWuha7FrwWvRa/FsEWwhbDFsUWxhcFFwcXCRcLFw0XDhcPFxAXERcTFxUXFhcXFxkXGhdZF1sXXRdfF2EXYhdjF2QXZRdnF2kXahdrF20Xbhd3F4UXkhegF60XwBfXF+kYNBhXGHcYlxiZGJsYnRifGKEYohijGKUYphioGKkYqxitGK4YrxixGLIYtxjEGMkYyxjNGNIY1BjWGNgY/RkhGUgZbBluGXAZchl0GXYZeBl5GXsZiBmZGZsZnRmfGaEZoxmlGacZqRm6GbwZvhnAGcIZxBnGGcgZyhnMGgsaDRoPGhEaExoUGhUaFhoXGhkaGxocGh0aHxogGl8aYRpjGmUaZxpoGmkaahprGm0abxpwGnEacxp0GrMatRq3Grkauxq8Gr0avhq/GsEawxrEGsUaxxrIGtUa1hrXGtkbGBsaGxwbHhsgGyEbIhsjGyQbJhsoGykbKhssGy0bbBtuG3Abcht0G3Ubdht3G3gbeht8G30bfhuAG4EbwBvCG8QbxhvIG8kbyhvLG8wbzhvQG9Eb0hvUG9UcFBwWHBgcGhwcHB0cHhwfHCAcIhwkHCUcJhwoHCkcaBxqHGwcbhxwHHEcchxzHHQcdhx4HHkcehx8HH0cohzGHO0dER0THRUdFx0ZHRsdHR0eHSAdLR08HT4dQB1CHUQdRh1IHUodWR1bHV0dXx1hHWMdZR1nHWkdqB2qHawdrh2wHbEdsh2zHbQdth24Hbkduh28Hb0d/B3+HgAeAh4EHgUeBh4HHggeCh4MHg0eDh4QHhEeUB5SHlQeVh5YHlkeWh5bHlweXh5gHmEeYh5kHmUepB6mHqgeqh6sHq0erh6vHrAesh60HrUeth64HrkevB77Hv0e/x8BHwMfBB8FHwYfBx8JHwsfDB8NHw8fEB9PH1EfUx9VH1cfWB9ZH1ofWx9dH18fYB9hH2MfZB+jH6Ufpx+pH6sfrB+tH64frx+xH7MftB+1H7cfuCADICYgRiBmIGggaiBsIG4gcCBxIHIgdCB1IHcgeCB6IHwgfSB+IIAggSCGIJMgmCCaIJwgoSCjIKUgpyDMIPAhFyE7IT0hPyFBIUMhRSFHIUghSiFXIWghaiFsIW4hcCFyIXQhdiF4IYkhiyGNIY8hkSGTIZUhlyGZIZsh2iHcId4h4CHiIeMh5CHlIeYh6CHqIesh7CHuIe8iLiIwIjIiNCI2IjciOCI5IjoiPCI+Ij8iQCJCIkMigiKEIoYiiCKKIosijCKNIo4ikCKSIpMilCKWIpcipCKlIqYiqCLnIuki6yLtIu8i8CLxIvIi8yL1Ivci+CL5Ivsi/CM7Iz0jPyNBI0MjRCNFI0YjRyNJI0sjTCNNI08jUCNRI5AjkiOUI5YjmCOZI5ojmyOcI54joCOhI6IjpCOlI+Qj5iPoI+oj7CPtI+4j7yPwI/Ij9CP1I/Yj+CP5JDgkOiQ8JD4kQCRBJEIkQyREJEYkSCRJJEokTCRNJHIkliS9JOEk4yTlJOck6STrJO0k7iTwJP0lDCUOJRAlEiUUJRYlGCUaJSklKyUtJS8lMSUzJTUlNyU5JXgleiV8JX4lgCWBJYIlgyWEJYYliCWJJYoljCWNJcwlziXQJdIl1CXVJdYl1yXYJdol3CXdJd4l4CXhJiAmIiYkJiYmKCYpJiomKyYsJi4mMCYxJjImNCY1JnQmdiZ4JnomfCZ9Jn4mfyaAJoImhCaFJoYmiCaJJowmyybNJs8m0SbTJtQm1SbWJtcm2SbbJtwm3SbfJuAnHychJyMnJScnJygnKScqJysnLScvJzAnMSczJzQncyd1J3cneSd7J3wnfSd+J38ngSeDJ4QnhSeHJ4gn0yf2KBYoNig4KDooPCg+KEAoQShCKEQoRShHKEgoSihMKE0oTihQKFEoVihjKGgoaihsKHEocyh1KHconCjAKOcpCykNKQ8pESkTKRUpFykYKRopJyk4KTopPCk+KUApQilEKUYpSClZKVspXSlfKWEpYyllKWcpaSlrKaoprCmuKbApsimzKbQptSm2Kbgpuim7Kbwpvim/Kf4qACoCKgQqBioHKggqCSoKKgwqDioPKhAqEioTKlIqVCpWKlgqWipbKlwqXSpeKmAqYipjKmQqZipnKnQqdSp2Kngqtyq5KrsqvSq/KsAqwSrCKsMqxSrHKsgqySrLKswrCysNKw8rESsTKxQrFSsWKxcrGSsbKxwrHSsfKyArXythK2MrZStnK2graStqK2srbStvK3ArcStzK3Qrsyu1K7cruSu7K7wrvSu+K78rwSvDK8QrxSvHK8gsBywJLAssDSwPLBAsESwSLBMsFSwXLBgsGSwbLBwsQSxlLIwssCyyLLQstiy4LLosvCy9LL8szCzbLN0s3yzhLOMs5SznLOks+Cz6LPws/i0ALQItBC0GLQgtRy1JLUstTS1PLVAtUS1SLVMtVS1XLVgtWS1bLVwtmy2dLZ8toS2jLaQtpS2mLactqS2rLawtrS2vLbAt7y3xLfMt9S33Lfgt+S36Lfst/S3/LgAuAS4DLgQuQy5FLkcuSS5LLkwuTS5OLk8uUS5TLlQuVS5XLlguly6ZLpsunS6fLqAuoS6iLqMupS6nLqguqS6rLqwu6y7tLu8u8S7zLvQu9S72Lvcu+S77Lvwu/S7/LwAvPy9BL0MvRS9HL0gvSS9KL0svTS9PL1AvUS9TL1Qvny/CL+IwAjAEMAYwCDAKMAwwDTAOMBAwETATMBQwFjAYMBkwGjAcMB0wJjAzMDgwOjA8MEEwQzBFMEcwbDCQMLcw2zDdMN8w4TDjMOUw5zDoMOow9zEIMQoxDDEOMRAxEjEUMRYxGDEpMSsxLTEvMTExMzE1MTcxOTE7MXoxfDF+MYAxgjGDMYQxhTGGMYgxijGLMYwxjjGPMc4x0DHSMdQx1jHXMdgx2THaMdwx3jHfMeAx4jHjMiIyJDImMigyKjIrMiwyLTIuMjAyMjIzMjQyNjI3MkQyRTJGMkgyhzKJMosyjTKPMpAykTKSMpMylTKXMpgymTKbMpwy2zLdMt8y4TLjMuQy5TLmMucy6TLrMuwy7TLvMvAzLzMxMzMzNTM3MzgzOTM6MzszPTM/M0AzQTNDM0QzgzOFM4cziTOLM4wzjTOOM48zkTOTM5QzlTOXM5gz1zPZM9sz3TPfM+Az4TPiM+Mz5TPnM+gz6TPrM+w0ETQ1NFw0gDSCNIQ0hjSINIo0jDSNNI80nDSrNK00rzSxNLM0tTS3NLk0yDTKNMw0zjTQNNI01DTWNNg1FzUZNRs1HTUfNSA1ITUiNSM1JTUnNSg1KTUrNSw1azVtNW81cTVzNXQ1dTV2NXc1eTV7NXw1fTV/NYA1vzXBNcM1xTXHNcg1yTXKNcs1zTXPNdA10TXTNdQ2EzYVNhc2GTYbNhw2HTYeNh82ITYjNiQ2JTYnNig2ZzZpNms2bTZvNnA2cTZyNnM2dTZ3Nng2eTZ7Nnw2uza9Nr82wTbDNsQ2xTbGNsc2yTbLNsw2zTbPNtA3DzcRNxM3FTcXNxg3GTcaNxs3HTcfNyA3ITcjNyQ3Lzc4Nzk3OzdEN083XjdpN3c3jDegN7c3yTfWN9c32DfaN+c36DfpN+s3+Df5N/o3/DgFOBQ4ITgwOEI4VjhtOH84iDiJOIs4mDiZOJo4nDidOKY4sDi3OL840TjWONsAAAAAAAACAgAAAAAAAAfoAAAAAAAAAAAAAAAAAAA43Q== - - - - - Organism - Undefined - 0 - Organism - 1 - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift deleted file mode 100644 index 033593e..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// OrganismV2ToV3MigrationPolicy.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import CoreData - -class OrganismV2ToV3MigrationPolicy: NSEntityMigrationPolicy { - - override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws { - - try super.createDestinationInstances(forSource: sInstance, in: mapping, manager: manager) - - for dInstance in manager.destinationInstances(forEntityMappingName: mapping.name, sourceInstances: [sInstance]) { - - dInstance.setValue( - false, - forKey: #keyPath(OrganismV3.hasVertebrae) - ) - dInstance.setValue( - sInstance.value(forKey: #keyPath(OrganismV2.numberOfFlippers)), - forKey: #keyPath(OrganismV3.numberOfLimbs) - ) - } - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift deleted file mode 100644 index e2a910e..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// OrganismV3.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class OrganismV3: NSManagedObject, OrganismProtocol { - - @NSManaged var dna: Int64 - @NSManaged var hasHead: Bool - @NSManaged var hasTail: Bool - @NSManaged var numberOfLimbs: Int32 - @NSManaged var hasVertebrae: Bool - - // MARK: OrganismProtocol - - func mutate() { - - self.hasHead = arc4random_uniform(2) == 1 - self.hasTail = arc4random_uniform(2) == 1 - self.numberOfLimbs = Int32(arc4random_uniform(9) / 2 * 2) - self.hasVertebrae = arc4random_uniform(2) == 1 - } -} diff --git a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml b/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml deleted file mode 100644 index 2798a07..0000000 --- a/LegacyDemo/LegacyDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - 134481920 - 8160C973-F2E8-4296-AC28-7329092D6700 - 107 - - - - NSPersistenceFrameworkVersion - 754 - NSStoreModelVersionHashes - - XDDevAttributeMapping - - 0plcXXRN7XHKl5CcF+fwriFmUpON3ZtcI/AfK748aWc= - - XDDevEntityMapping - - qeN1Ym3TkWN1G6dU9RfX6Kd2ccEvcDVWHpd3LpLgboI= - - XDDevMappingModel - - EqtMzvRnVZWkXwBHu4VeVGy8UyoOe+bi67KC79kphlQ= - - XDDevPropertyMapping - - XN33V44TTGY4JETlMoOB5yyTKxB+u4slvDIinv0rtGA= - - XDDevRelationshipMapping - - akYY9LhehVA/mCb4ATLWuI9XGLcjpm14wWL1oEBtIcs= - - - NSStoreModelVersionHashesVersion - 3 - NSStoreModelVersionIdentifiers - - - - - - - - - CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel - YnBsaXN0MDDUAAEAAgADAAQABQAGB+QH5VgkdmVyc2lvblgkb2JqZWN0c1kkYXJjaGl2ZXJUJHRv -cBIAAYagrxDFAAcACAAXADMANAA1AD0APgBZAFoAWwBhAGIAbgCCAIMAhACFAIYAhwCIAIkAigCjAKYArQCzAMIA0QDgAOMAWADzAQIBBgEKARkBHwEgASgBNwE4AUEBTwFQAVEBUgFTAVQBaQFqAXIBcwF0AYABlAGVAZYBlwGYAZkBmgGbAZwBqwG6AckBzQHcAesB+gIJAhgCJAI2AjcCOAI5AjoCOwI8Aj0CTAJNAlwCawJ6AnsCigKZAqgCsALFAsYCzgLaAu4C/QMMAxsDHwMuAz0DTANbA2oDdgOIA5cDpgO1A8QDxQPUA+MD8gQHBAgEEAQcBDAEPwROBF0EYQRwBH8EgASPBJ4ErQS5BMsE2gTpBPgFBwUIBRcFJgU1BUoFSwVTBV8FcwWCBZEFoAWkBbMFwgXRBeAF7wX7Bg0GHAYrBjoGSQZYBmcGdgaLBowGlAagBrQGwwbSBuEG5Qb0BwMHEgchBzAHPAdOB10HbAd7B4oHmQeoB7cHuAe7B8QHyAfMB9AH2AfbB98H4FUkbnVsbNcACQAKAAsADAANAA4ADwAQABEAEgATABQAEwAWXxAPX3hkX3Jvb3RQYWNrYWdlViRjbGFzc1xfeGRfY29tbWVudHNfEBBfeGRfbW9kZWxNYW5hZ2VyXxAVX2NvbmZpZ3VyYXRpb25zQnlOYW1lXV94ZF9tb2RlbE5hbWVfEBdfbW9kZWxWZXJzaW9uSWRlbnRpZmllcoACgMSAwYAAgMKAAIDD3gAYABkAGgAbABwAHQAeAAoAHwAgACEAIgAjACQAJQAmACcAKAAlABMAKwAsAC0ALgAvACUAJQATXxAcWERCdWNrZXRGb3JDbGFzc2Vzd2FzRW5jb2RlZF8QGlhEQnVja2V0Rm9yUGFja2FnZXNzdG9yYWdlXxAcWERCdWNrZXRGb3JJbnRlcmZhY2Vzc3RvcmFnZV8QD194ZF9vd25pbmdNb2RlbF8QHVhEQnVja2V0Rm9yUGFja2FnZXN3YXNFbmNvZGVkVl9vd25lcl8QG1hEQnVja2V0Rm9yRGF0YVR5cGVzc3RvcmFnZVtfdmlzaWJpbGl0eV8QGVhEQnVja2V0Rm9yQ2xhc3Nlc3N0b3JhZ2VVX25hbWVfEB9YREJ1Y2tldEZvckludGVyZmFjZXN3YXNFbmNvZGVkXxAeWERCdWNrZXRGb3JEYXRhVHlwZXN3YXNFbmNvZGVkXxAQX3VuaXF1ZUVsZW1lbnRJRIAEgL+AvYABgASAAIC+gMAQAIAFgAOABIAEgABQU1lFU9MANgA3AAoAOAA6ADxXTlMua2V5c1pOUy5vYmplY3RzoQA5gAahADuAB4AiWE9yZ2FuaXNt3xAQAD8AQABBAEIAHQBDAEQAHwBFAEYACgAhAEcASAAkAEkASgBLACUAJQAQAE8AUAAtACUASgBTADkASgBWAFcAWF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzc3RvcmFnZV8QIFhEQnVja2V0Rm9yU3RlcmVvdHlwZXN3YXNFbmNvZGVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAdWERCdWNrZXRGb3JTdGVyZW90eXBlc3N0b3JhZ2VfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc2R1cGxpY2F0ZXNfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc3dhc0VuY29kZWRfEB1YREJ1Y2tldEZvclN0ZXJlb3R5cGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zc3RvcmFnZVtfaXNBYnN0cmFjdIAJgCqABIAEgAKACoC6gASACYC8gAaACYC7gAgIEpznnxdXb3JkZXJlZNMANgA3AAoAXABeADyhAF2AC6EAX4AMgCJeWERfUFN0ZXJlb3R5cGXZAB0AIQBjAAoAJABkAB8ASQBlADsAXQBKAGkAEwAlAC0AWABtXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNvcmRlcmVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNzdG9yYWdlgAeAC4AJgCmAAIAECIAN0wA2ADcACgBvAHgAPKgAcABxAHIAcwB0AHUAdgB3gA6AD4AQgBGAEoATgBSAFagAeQB6AHsAfAB9AH4AfwCAgBaAGoAbgByAHoAggCOAJ4AiXxATWERQTUNv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bXDSADcACgfZAKWggBjTADYANwAKB9wH3QA8oKCAIlDSAKcAqAfhB+JZWERQTU1vZGVsowfhB+MArFdYRE1vZGVsXxAPTlNLZXllZEFyY2hpdmVy0QfmAChUcm9vdIABAAgAGQAiACsANQA6AD8BzAHSAe8CAQIIAhUCKAJAAk4CaAJqAmwCbgJwAnICdAJ2Aq8CzgLrAwoDHAM8A0MDYQNtA4kDjwOxA9ID5QPnA+kD6wPtA+8D8QPzA/UD9wP5A/sD/QP/BAEEAgQGBBMEGwQmBCkEKwQuBDAEMgQ7BH4EogTGBOkFEAUwBVcFfgWeBcIF5gXyBfQF9gX4BfoF/AX+BgAGAgYEBgYGCAYKBgwGDgYPBhQGHAYpBiwGLgYxBjMGNQZEBmkGjQa0BtgG2gbcBt4G4AbiBuQG5QbnBvQHBQcHBwkHCwcNBw8HEQcTBxUHJgcoByoHLAcuBzAHMgc0BzYHOAdOB2EHfgeaB64HwAfWB+8ILgg0CD0ISghWCGAIagh1CIAIjQiVCJcImQibCJ0IngifCKAIoQijCKUIpginCKkIqgizCLQItgi/CMoI0wjiCOkI8Qj6CQMJFgkfCTIJSQlbCZoJnAmeCaAJogmjCaQJpQmmCagJqgmrCawJrgmvCe4J8AnyCfQJ9gn3CfgJ+Qn6CfwJ/gn/CgAKAgoDCkIKRApGCkgKSgpLCkwKTQpOClAKUgpTClQKVgpXCmAKYQpjCqIKpAqmCqgKqgqrCqwKrQquCrAKsgqzCrQKtgq3CrgK9wr5CvsK/Qr/CwALAQsCCwMLBQsHCwgLCQsLCwwLGQsaCxsLHQsmCzwLQwtQC48LkQuTC5ULlwuYC5kLmgubC50LnwugC6ELowukC70LvwvBC8MLxAvGC90L5gv0DAEMDwwkDDgMTwxhDKAMogykDKYMqAypDKoMqwysDK4MsAyxDLIMtAy1DNAM2QzuDP0NEg0gDTUNSQ1gDXINfw2KDYwNjg2QDZINlA2fDaENow2lDacNqQ2rDbkNxg3KDdIN2g4lDkgOaA6IDooOjA6ODpAOkg6TDpQOlg6XDpkOmg6cDp4Onw6gDqIOow6oDrUOug68Dr4Oww7FDscOyQ7eDvMPGA88D2MPhw+JD4sPjQ+PD5EPkw+UD5YPow+0D7YPuA+6D7wPvg/AD8IPxA/VD9cP2Q/bD90P3w/hD+MP5Q/nEAUQIxA2EEoQXxB8EJAQphDlEOcQ6RDrEO0Q7hDvEPAQ8RDzEPUQ9hD3EPkQ+hE5ETsRPRE/EUERQhFDEUQRRRFHEUkRShFLEU0RThGNEY8RkRGTEZURlhGXEZgRmRGbEZ0RnhGfEaERohGvEbARsRGzEfIR9BH2EfgR+hH7EfwR/RH+EgASAhIDEgQSBhIHEkYSSBJKEkwSThJPElASURJSElQSVhJXElgSWhJbEpoSnBKeEqASohKjEqQSpRKmEqgSqhKrEqwSrhKvEu4S8BLyEvQS9hL3EvgS+RL6EvwS/hL/EwATAhMDE0ITRBNGE0gTShNLE0wTTRNOE1ATUhNTE1QTVhNXE3wToBPHE+sT7RPvE/ET8xP1E/cT+BP6FAcUFhQYFBoUHBQeFCAUIhQkFDMUNRQ3FDkUOxQ9FD8UQRRDFGMUjhSoFMEU2xT7FR4VXRVfFWEVYxVlFWYVZxVoFWkVaxVtFW4VbxVxFXIVdBWzFbUVtxW5FbsVvBW9Fb4VvxXBFcMVxBXFFccVyBYHFgkWCxYNFg8WEBYRFhIWExYVFhcWGBYZFhsWHBZbFl0WXxZhFmMWZBZlFmYWZxZpFmsWbBZtFm8WcBZyFrEWsxa1FrcWuRa6FrsWvBa9Fr8WwRbCFsMWxRbGFwUXBxcJFwsXDRcOFw8XEBcRFxMXFRcWFxcXGRcaF1kXWxddF18XYRdiF2MXZBdlF2cXaRdqF2sXbRduF3cXhReSF6AXrRfAF9cX6Rg0GFcYdxiXGJkYmxidGJ8YoRiiGKMYpRimGKgYqRirGK0YrhivGLEYshi3GMQYyRjLGM0Y0hjUGNYY2Bj9GSEZSBlsGW4ZcBlyGXQZdhl4GXkZexmIGZkZmxmdGZ8ZoRmjGaUZpxmpGboZvBm+GcAZwhnEGcYZyBnKGcwaCxoNGg8aERoTGhQaFRoWGhcaGRobGhwaHRofGiAaXxphGmMaZRpnGmgaaRpqGmsabRpvGnAacRpzGnQasxq1GrcauRq7GrwavRq+Gr8awRrDGsQaxRrHGsga1RrWGtca2RsYGxobHBseGyAbIRsiGyMbJBsmGygbKRsqGywbLRtsG24bcBtyG3QbdRt2G3cbeBt6G3wbfRt+G4AbgRvAG8IbxBvGG8gbyRvKG8sbzBvOG9Ab0RvSG9Qb1RwUHBYcGBwaHBwcHRweHB8cIBwiHCQcJRwmHCgcKRxoHGocbBxuHHAccRxyHHMcdBx2HHgceRx6HHwcfRyiHMYc7R0RHRMdFR0XHRkdGx0dHR4dIB0tHTwdPh1AHUIdRB1GHUgdSh1ZHVsdXR1fHWEdYx1lHWcdaR2oHaodrB2uHbAdsR2yHbMdtB22HbgduR26HbwdvR38Hf4eAB4CHgQeBR4GHgceCB4KHgweDR4OHhAeER5QHlIeVB5WHlgeWR5aHlseXB5eHmAeYR5iHmQeZR6kHqYeqB6qHqwerR6uHq8esB6yHrQetR62HrgeuR68Hvse/R7/HwEfAx8EHwUfBh8HHwkfCx8MHw0fDx8QH08fUR9TH1UfVx9YH1kfWh9bH10fXx9gH2EfYx9kH6MfpR+nH6kfqx+sH60frh+vH7Efsx+0H7Uftx+4IAMgJiBGIGYgaCBqIGwgbiBwIHEgciB0IHUgdyB4IHogfCB9IH4ggCCBIIYgkyCYIJognCChIKMgpSCnIMwg8CEXITshPSE/IUEhQyFFIUchSCFKIVchaCFqIWwhbiFwIXIhdCF2IXghiSGLIY0hjyGRIZMhlSGXIZkhmyHaIdwh3iHgIeIh4yHkIeUh5iHoIeoh6yHsIe4h7yIuIjAiMiI0IjYiNyI4IjkiOiI8Ij4iPyJAIkIiQyKCIoQihiKIIooiiyKMIo0ijiKQIpIikyKUIpYilyKkIqUipiKoIuci6SLrIu0i7yLwIvEi8iLzIvUi9yL4Ivki+yL8IzsjPSM/I0EjQyNEI0UjRiNHI0kjSyNMI00jTyNQI1EjkCOSI5QjliOYI5kjmiObI5wjniOgI6EjoiOkI6Uj5CPmI+gj6iPsI+0j7iPvI/Aj8iP0I/Uj9iP4I/kkOCQ6JDwkPiRAJEEkQiRDJEQkRiRIJEkkSiRMJE0kciSWJL0k4STjJOUk5yTpJOsk7STuJPAk/SUMJQ4lECUSJRQlFiUYJRolKSUrJS0lLyUxJTMlNSU3JTkleCV6JXwlfiWAJYElgiWDJYQlhiWIJYkliiWMJY0lzCXOJdAl0iXUJdUl1iXXJdgl2iXcJd0l3iXgJeEmICYiJiQmJiYoJikmKiYrJiwmLiYwJjEmMiY0JjUmdCZ2JngmeiZ8Jn0mfiZ/JoAmgiaEJoUmhiaIJokmjCbLJs0mzybRJtMm1CbVJtYm1ybZJtsm3CbdJt8m4CcfJyEnIyclJycnKCcpJyonKyctJy8nMCcxJzMnNCdzJ3Undyd5J3snfCd9J34nfyeBJ4MnhCeFJ4cniCfTJ/YoFig2KDgoOig8KD4oQChBKEIoRChFKEcoSChKKEwoTShOKFAoUShWKGMoaChqKGwocShzKHUodyicKMAo5ykLKQ0pDykRKRMpFSkXKRgpGiknKTgpOik8KT4pQClCKUQpRilIKVkpWyldKV8pYSljKWUpZylpKWspqimsKa4psCmyKbMptCm1KbYpuCm6KbspvCm+Kb8p/ioAKgIqBCoGKgcqCCoJKgoqDCoOKg8qECoSKhMqUipUKlYqWCpaKlsqXCpdKl4qYCpiKmMqZCpmKmcqdCp1KnYqeCq3Krkquyq9Kr8qwCrBKsIqwyrFKscqyCrJKssqzCsLKw0rDysRKxMrFCsVKxYrFysZKxsrHCsdKx8rICtfK2ErYytlK2craCtpK2orayttK28rcCtxK3MrdCuzK7Urtyu5K7srvCu9K74rvyvBK8MrxCvFK8cryCwHLAksCywNLA8sECwRLBIsEywVLBcsGCwZLBssHCxBLGUsjCywLLIstCy2LLgsuiy8LL0svyzMLNss3SzfLOEs4yzlLOcs6Sz4LPos/Cz+LQAtAi0ELQYtCC1HLUktSy1NLU8tUC1RLVItUy1VLVctWC1ZLVstXC2bLZ0tny2hLaMtpC2lLaYtpy2pLastrC2tLa8tsC3vLfEt8y31Lfct+C35Lfot+y39Lf8uAC4BLgMuBC5DLkUuRy5JLksuTC5NLk4uTy5RLlMuVC5VLlcuWC6XLpkumy6dLp8uoC6hLqIuoy6lLqcuqC6pLqsurC7rLu0u7y7xLvMu9C71LvYu9y75Lvsu/C79Lv8vAC8/L0EvQy9FL0cvSC9JL0ovSy9NL08vUC9RL1MvVC+fL8Iv4jACMAQwBjAIMAowDDANMA4wEDARMBMwFDAWMBgwGTAaMBwwHTAiMC8wNDA2MDgwPTA/MEEwQzBoMIwwszDXMNkw2zDdMN8w4TDjMOQw5jDzMQQxBjEIMQoxDDEOMRAxEjEUMSUxJzEpMSsxLTEvMTExMzE1MTcxdjF4MXoxfDF+MX8xgDGBMYIxhDGGMYcxiDGKMYsxyjHMMc4x0DHSMdMx1DHVMdYx2DHaMdsx3DHeMd8yHjIgMiIyJDImMicyKDIpMioyLDIuMi8yMDIyMjMyQDJBMkIyRDKDMoUyhzKJMosyjDKNMo4yjzKRMpMylDKVMpcymDLXMtky2zLdMt8y4DLhMuIy4zLlMucy6DLpMusy7DMrMy0zLzMxMzMzNDM1MzYzNzM5MzszPDM9Mz8zQDN/M4EzgzOFM4cziDOJM4ozizONM48zkDORM5MzlDPTM9Uz1zPZM9sz3DPdM94z3zPhM+Mz5DPlM+cz6DQNNDE0WDR8NH40gDSCNIQ0hjSINIk0izSYNKc0qTSrNK00rzSxNLM0tTTENMY0yDTKNMw0zjTQNNI01DUTNRU1FzUZNRs1HDUdNR41HzUhNSM1JDUlNSc1KDVnNWk1azVtNW81cDVxNXI1czV1NXc1eDV5NXs1fDW7Nb01vzXBNcM1xDXFNcY1xzXJNcs1zDXNNc810DYPNhE2EzYVNhc2GDYZNho2GzYdNh82IDYhNiM2JDZjNmU2ZzZpNms2bDZtNm42bzZxNnM2dDZ1Nnc2eDa3Nrk2uza9Nr82wDbBNsI2wzbFNsc2yDbJNss2zDcLNw03DzcRNxM3FDcVNxY3FzcZNxs3HDcdNx83IDcrNzQ3NTc3N0A3SzdaN2U3czeIN5w3szfFN9I30zfUN9Y34zfkN+U35zf0N/U39jf4OAE4EDgdOCw4PjhSOGk4eziEOIU4hziUOJU4ljiYOJk4ojisOLM4uzjNONI41wAAAAAAAAICAAAAAAAAB+gAAAAAAAAAAAAAAAAAADjZ - - CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel - YnBsaXN0MDDUAAEAAgADAAQABQAGBqAGoVgkdmVyc2lvblgkb2JqZWN0c1kkYXJjaGl2ZXJUJHRv -cBIAAYagrxCtAAcACAAXADMANAA1AD0APgBZAFoAWwBhAGIAbgCCAIMAhACFAIYAhwCIAIkAigCjAKYArQCzAMIA0QDgAOMAWADzAQIBBgEKARkBHwEgASgBNwE4AUEBTQFOAU8BUAFRAWYBZwFvAXABcQF9AZEBkgGTAZQBlQGWAZcBmAGZAagBtwHGAcoB2QHoAekB+AIHAhYCIgI0AjUCNgI3AjgCOQI6AjsCSgJLAloCaQJ4AnkCiAKXAqYCrgLDAsQCzALYAuwC+wMKAxkDHQMsAzsDSgNZA2gDdAOGA5UDpAOzA8IDwwPSA+ED8AQFBAYEDgQaBC4EPQRMBFsEXwRuBH0EjASbBKoEtgTIBNcE5gT1BQQFBQUUBSMFMgVHBUgFUAVcBXAFfwWOBZ0FoQWwBb8FzgXdBewF+AYKBhkGKAY3BkYGVQZkBnMGdAZ3BoAGhAaIBowGlAaXBpsGnFUkbnVsbNcACQAKAAsADAANAA4ADwAQABEAEgATABQAEwAWXxAPX3hkX3Jvb3RQYWNrYWdlViRjbGFzc1xfeGRfY29tbWVudHNfEBBfeGRfbW9kZWxNYW5hZ2VyXxAVX2NvbmZpZ3VyYXRpb25zQnlOYW1lXV94ZF9tb2RlbE5hbWVfEBdfbW9kZWxWZXJzaW9uSWRlbnRpZmllcoACgKyAqYAAgKqAAICr3gAYABkAGgAbABwAHQAeAAoAHwAgACEAIgAjACQAJQAmACcAKAAlABMAKwAsAC0ALgAvACUAJQATXxAcWERCdWNrZXRGb3JDbGFzc2Vzd2FzRW5jb2RlZF8QGlhEQnVja2V0Rm9yUGFja2FnZXNzdG9yYWdlXxAcWERCdWNrZXRGb3JJbnRlcmZhY2Vzc3RvcmFnZV8QD194ZF9vd25pbmdNb2RlbF8QHVhEQnVja2V0Rm9yUGFja2FnZXN3YXNFbmNvZGVkVl9vd25lcl8QG1hEQnVja2V0Rm9yRGF0YVR5cGVzc3RvcmFnZVtfdmlzaWJpbGl0eV8QGVhEQnVja2V0Rm9yQ2xhc3Nlc3N0b3JhZ2VVX25hbWVfEB9YREJ1Y2tldEZvckludGVyZmFjZXN3YXNFbmNvZGVkXxAeWERCdWNrZXRGb3JEYXRhVHlwZXN3YXNFbmNvZGVkXxAQX3VuaXF1ZUVsZW1lbnRJRIAEgKeApYABgASAAICmgKgQAIAFgAOABIAEgABQU1lFU9MANgA3AAoAOAA6ADxXTlMua2V5c1pOUy5vYmplY3RzoQA5gAahADuAB4AiWE9yZ2FuaXNt3xAQAD8AQABBAEIAHQBDAEQAHwBFAEYACgAhAEcASAAkAEkASgBLACUAJQAQAE8AUAAtACUASgBTADkASgBWAFcAWF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yT3duZWRBdHRyaWJ1dGVzc3RvcmFnZV8QIFhEQnVja2V0Rm9yU3RlcmVvdHlwZXN3YXNFbmNvZGVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAdWERCdWNrZXRGb3JTdGVyZW90eXBlc3N0b3JhZ2VfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc2R1cGxpY2F0ZXNfECRYREJ1Y2tldEZvckdlbmVyYWxpemF0aW9uc3dhc0VuY29kZWRfEB1YREJ1Y2tldEZvclN0ZXJlb3R5cGVzb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zb3JkZXJlZF8QIVhEQnVja2V0Rm9yR2VuZXJhbGl6YXRpb25zc3RvcmFnZVtfaXNBYnN0cmFjdIAJgCqABIAEgAKACoCigASACYCkgAaACYCjgAgIEox4F8pXb3JkZXJlZNMANgA3AAoAXABeADyhAF2AC6EAX4AMgCJeWERfUFN0ZXJlb3R5cGXZAB0AIQBjAAoAJABkAB8ASQBlADsAXQBKAGkAEwAlAC0AWABtXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNvcmRlcmVkXxAkWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXN3YXNFbmNvZGVkXxAhWERCdWNrZXRGb3JPd25lZEF0dHJpYnV0ZXNzdG9yYWdlgAeAC4AJgCmAAIAECIAN0wA2ADcACgBvAHgAPKgAcABxAHIAcwB0AHUAdgB3gA6AD4AQgBGAEoATgBSAFagAeQB6AHsAfAB9AH4AfwCAgBaAGoAbgByAHoAggCOAJ4AiXxATWERQTUNvbXBvdW5kSW5kZXhlc18QEFhEX1BTS19lbGVtZW50SURfEBpYRF9QU0tfdmVyc2lv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ExMTFBMVExcTGBM9E2ETiBOsE64TsBOyE7QTthO4E7kTuxPIE9cT2RPbE90T3xPhE+MT5RP0E/YT+BP6E/wT/hQAFAIUBBQkFE8UaRSCFJwUvBTfFR4VIBUiFSQVJhUnFSgVKRUqFSwVLhUvFTAVMhUzFTUVdBV2FXgVehV8FX0VfhV/FYAVghWEFYUVhhWIFYkVyBXKFcwVzhXQFdEV0hXTFdQV1hXYFdkV2hXcFd0WHBYeFiAWIhYkFiUWJhYnFigWKhYsFi0WLhYwFjEWNBZzFnUWdxZ5FnsWfBZ9Fn4WfxaBFoMWhBaFFocWiBbHFskWyxbNFs8W0BbRFtIW0xbVFtcW2BbZFtsW3BcbFx0XHxchFyMXJBclFyYXJxcpFysXLBctFy8XMBc5F0cXVBdiF28XgheZF6sX9hgZGDkYWRhbGF0YXxhhGGMYZBhlGGcYaBhqGGsYbRhvGHAYcRhzGHQYeRiGGIsYjRiPGJQYlhiYGJoYvxjjGQoZLhkwGTIZNBk2GTgZOhk7GT0ZShlbGV0ZXxlhGWMZZRlnGWkZaxl8GX4ZgBmCGYQZhhmIGYoZjBmOGc0ZzxnRGdMZ1RnWGdcZ2BnZGdsZ3RneGd8Z4RniGiEaIxolGicaKRoqGisaLBotGi8aMRoyGjMaNRo2GnUadxp5GnsafRp+Gn8agBqBGoMahRqGGocaiRqKGpcamBqZGpsa2hrcGt4a4BriGuMa5BrlGuYa6BrqGusa7BruGu8bLhswGzIbNBs2GzcbOBs5GzobPBs+Gz8bQBtCG0MbghuEG4YbiBuKG4sbjBuNG44bkBuSG5MblBuWG5cb1hvYG9ob3BveG98b4BvhG+Ib5BvmG+cb6BvqG+scKhwsHC4cMBwyHDMcNBw1HDYcOBw6HDscPBw+HD8cZByIHK8c0xzVHNcc2RzbHN0c3xzgHOIc7xz+HQAdAh0EHQYdCB0KHQwdGx0dHR8dIR0jHSUdJx0pHSsdah1sHW4dcB1yHXMddB11HXYdeB16HXsdfB1+HX8dvh3AHcIdxB3GHccdyB3JHcodzB3OHc8d0B3SHdMeEh4UHhYeGB4aHhseHB4dHh4eIB4iHiMeJB4mHiceZh5oHmoebB5uHm8ecB5xHnIedB52HnceeB56Hnsefh69Hr8ewR7DHsUexh7HHsgeyR7LHs0ezh7PHtEe0h8RHxMfFR8XHxkfGh8bHxwfHR8fHyEfIh8jHyUfJh9lH2cfaR9rH20fbh9vH3AfcR9zH3Ufdh93H3kfeh/FH+ggCCAoICogLCAuIDAgMiAzIDQgNiA3IDkgOiA8ID4gPyBAIEIgQyBMIFkgXiBgIGIgZyBpIGsgbSCSILYg3SEBIQMhBSEHIQkhCyENIQ4hECEdIS4hMCEyITQhNiE4ITohPCE+IU8hUSFTIVUhVyFZIVshXSFfIWEhoCGiIaQhpiGoIakhqiGrIawhriGwIbEhsiG0IbUh9CH2Ifgh+iH8If0h/iH/IgAiAiIEIgUiBiIIIgkiSCJKIkwiTiJQIlEiUiJTIlQiViJYIlkiWiJcIl0iaiJrImwibiKtIq8isSKzIrUitiK3IrgiuSK7Ir0iviK/IsEiwiMBIwMjBSMHIwkjCiMLIwwjDSMPIxEjEiMTIxUjFiNVI1cjWSNbI10jXiNfI2AjYSNjI2UjZiNnI2kjaiOpI6sjrSOvI7EjsiOzI7QjtSO3I7kjuiO7I70jviP9I/8kASQDJAUkBiQHJAgkCSQLJA0kDiQPJBEkEiQ3JFskgiSmJKgkqiSsJK4ksCSyJLMktSTCJNEk0yTVJNck2STbJN0k3yTuJPAk8iT0JPYk+CT6JPwk/iU9JT8lQSVDJUUlRiVHJUglSSVLJU0lTiVPJVElUiWRJZMllSWXJZklmiWbJZwlnSWfJaEloiWjJaUlpiXlJecl6SXrJe0l7iXvJfAl8SXzJfUl9iX3Jfkl+iY5JjsmPSY/JkEmQiZDJkQmRSZHJkkmSiZLJk0mTiZQJo8mkSaTJpUmlyaYJpkmmiabJp0mnyagJqEmoyakJuMm5SbnJukm6ybsJu0m7ibvJvEm8yb0JvUm9yb4JzcnOSc7Jz0nPydAJ0EnQidDJ0UnRydIJ0knSydMJ5cnuifaJ/on/Cf+KAAoAigEKAUoBigIKAkoCygMKA4oECgRKBIoFCgVKBooJygsKC4oMCg1KDcoOSg7KGAohCirKM8o0SjTKNUo1yjZKNso3CjeKOso/Cj+KQApAikEKQYpCCkKKQwpHSkfKSEpIyklKScpKSkrKS0pLyluKXApcil0KXYpdyl4KXkpeil8KX4pfymAKYIpgynCKcQpxinIKcopyynMKc0pzinQKdIp0ynUKdYp1yoWKhgqGiocKh4qHyogKiEqIiokKiYqJyooKioqKyo4KjkqOio8KnsqfSp/KoEqgyqEKoUqhiqHKokqiyqMKo0qjyqQKs8q0SrTKtUq1yrYKtkq2irbKt0q3yrgKuEq4yrkKyMrJSsnKykrKyssKy0rLisvKzErMys0KzUrNys4K3creSt7K30rfyuAK4ErgiuDK4UrhyuIK4kriyuMK8srzSvPK9Er0yvUK9Ur1ivXK9kr2yvcK90r3yvgLAUsKSxQLHQsdix4LHosfCx+LIAsgSyDLJAsnyyhLKMspSynLKksqyytLLwsvizALMIsxCzGLMgsyizMLQstDS0PLREtEy0ULRUtFi0XLRktGy0cLR0tHy0gLV8tYS1jLWUtZy1oLWktai1rLW0tby1wLXEtcy10LbMttS23Lbktuy28Lb0tvi2/LcEtwy3ELcUtxy3ILgcuCS4LLg0uDy4QLhEuEi4TLhUuFy4YLhkuGy4cLlsuXS5fLmEuYy5kLmUuZi5nLmkuay5sLm0uby5wLq8usS6zLrUuty64Lrkuui67Lr0uvy7ALsEuwy7ELwMvBS8HLwkvCy8MLw0vDi8PLxEvEy8ULxUvFy8YLyMvLC8tLy8vOC9DL1IvXS9rL4AvlC+rL70vyi/LL8wvzi/bL9wv3S/fL+wv7S/uL/Av+TAIMBUwJDA2MEowYTBzMHwwfTB/MIwwjTCOMJAwkTCaMKQwqzCzMMUwyjDPAAAAAAAAAgIAAAAAAAAGpAAAAAAAAAAAAAAAAAAAMNE= - - - - - Organism - Undefined - 1 - Organism - 1 - - - - - - YnBsaXN0MDDUAQIDBAUGPD1YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoKwH -CBMUGRoiJywtMjZVJG51bGzVCQoLDA0ODxAREllOU09wZXJhbmReTlNTZWxlY3Rvck5hbWVfEBBOU0V4cHJlc3Npb25UeXBlW05TQXJndW1lbnRzViRjbGFzc4ADgAIQBIAGgAtfEBB2YWx1ZUZvcktleVBhdGg60xULDRYXGFpOU1ZhcmlhYmxlgAQQAoAFVnNvdXJjZdIbHB0eWiRjbGFzc25hbWVYJGNsYXNzZXNfEBROU1ZhcmlhYmxlRXhwcmVzc2lvbqMfICFfEBROU1ZhcmlhYmxlRXhwcmVzc2lvblxOU0V4cHJlc3Npb25YTlNPYmplY3TSIw0kJlpOUy5vYmplY3RzoSWAB4AK0w0LKCkqK1lOU0tleVBhdGiACRAKgAhdbnVtYmVyT2ZMaW1ic9IbHC4vXxAcTlNLZXlQYXRoU3BlY2lmaWVyRXhwcmVzc2lvbqMwMSFfEBxOU0tleVBhdGhTcGVjaWZpZXJFeHByZXNzaW9uXE5TRXhwcmVzc2lvbtIbHDM0Xk5TTXV0YWJsZUFycmF5ozM1IVdOU0FycmF50hscNzhfEBNOU0tleVBhdGhFeHByZXNzaW9upDk6OyFfEBNOU0tleVBhdGhFeHByZXNzaW9uXxAUTlNGdW5jdGlvbkV4cHJlc3Npb25cTlNFeHByZXNzaW9uXxAPTlNLZXllZEFyY2hpdmVy0T4/VHJvb3SAAQAIABEAGgAjAC0AMgA3AEQASgBVAF8AbgCBAI0AlACWAJgAmgCcAJ4AsQC4AMMAxQDHAMkA0ADVAOAA6QEAAQQBGwEoATEBNgFBAUMBRQFHAU4BWAFaAVwBXgFsAXEBkAGUAbMBwAHFAdQB2AHgAeUB+wIAAhYCLQI6AkwCTwJUAAAAAAAAAgEAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAlY= - - numberOfFlippers - - - - hasTail - - - - hasHead - - - - dna - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/.xccurrentversion b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/.xccurrentversion deleted file mode 100644 index d85ac4a..0000000 --- a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,8 +0,0 @@ - - - - - _XCCurrentVersionName - MigrationDemoV3.xcdatamodel - - diff --git a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents deleted file mode 100644 index 9063bad..0000000 --- a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents deleted file mode 100644 index 3a252de..0000000 --- a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents b/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents deleted file mode 100644 index 1d684b5..0000000 --- a/LegacyDemo/LegacyDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift deleted file mode 100644 index e370d49..0000000 --- a/LegacyDemo/LegacyDemo/Stack Setup Demo/FemaleAccount.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// FemaleAccount.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/06. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class FemaleAccount: UserAccount { - - -} diff --git a/LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift deleted file mode 100644 index faba9ba..0000000 --- a/LegacyDemo/LegacyDemo/Stack Setup Demo/MaleAccount.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// MaleAccount.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/06/06. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - -class MaleAccount: UserAccount { - - -} diff --git a/LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift deleted file mode 100644 index d2422b5..0000000 --- a/LegacyDemo/LegacyDemo/Stack Setup Demo/StackSetupDemoViewController.swift +++ /dev/null @@ -1,196 +0,0 @@ -// -// StackSetupDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - - -private struct Static { - - static let maleConfiguration = "MaleAccounts" - static let femaleConfiguration = "FemaleAccounts" - - static let facebookStack: DataStack = { - - let dataStack = DataStack(xcodeModelName: "StackSetupDemo") - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "AccountsDemo_FB_Male.sqlite", - configuration: maleConfiguration, - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "AccountsDemo_FB_Female.sqlite", - configuration: femaleConfiguration, - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - - _ = try? dataStack.perform( - synchronous: { (transaction) in - - try transaction.deleteAll(From()) - - let account1 = transaction.create(Into(maleConfiguration)) - account1.accountType = "Facebook" - account1.name = "John Smith HCD" - account1.friends = 42 - - let account2 = transaction.create(Into(femaleConfiguration)) - account2.accountType = "Facebook" - account2.name = "Jane Doe HCD" - account2.friends = 314 - } - ) - - return dataStack - }() - - static let twitterStack: DataStack = { - - let dataStack = DataStack(xcodeModelName: "StackSetupDemo") - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "AccountsDemo_TW_Male.sqlite", - configuration: maleConfiguration, - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - try! dataStack.addStorageAndWait( - SQLiteStore( - fileName: "AccountsDemo_TW_Female.sqlite", - configuration: femaleConfiguration, - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - - _ = try? dataStack.perform( - synchronous: { (transaction) in - - try transaction.deleteAll(From()) - - let account1 = transaction.create(Into(maleConfiguration)) - account1.accountType = "Twitter" - account1.name = "#johnsmith_hcd" - account1.friends = 7 - - let account2 = transaction.create(Into(femaleConfiguration)) - account2.accountType = "Twitter" - account2.name = "#janedoe_hcd" - account2.friends = 100 - } - ) - return dataStack - }() -} - - - - -// MARK: - StackSetupDemoViewController - -class StackSetupDemoViewController: UITableViewController { - - let accounts = [ - try! Static.facebookStack.fetchAll(From()), - try! Static.twitterStack.fetchAll(From()) - ] - - - // MARK: UIViewController - - override func viewWillAppear(_ animated: Bool) { - - super.viewWillAppear(animated) - - self.tableView.reloadData() - - let indexPath = IndexPath(row: 0, section: 0) - self.tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) - self.updateDetails(account: self.accounts[indexPath.section][indexPath.row]) - } - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - let alert = UIAlertController( - title: "Setup Demo", - message: "This demo shows how to initialize 2 DataStacks with 2 configurations each, for a total of 4 SQLite files, each with 1 instance of a \"UserAccount\" entity.", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - } - - - // MARK: UITableViewDataSource - - override func numberOfSections(in tableView: UITableView) -> Int { - - return self.accounts.count - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - - return self.accounts[section].count - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - - let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell")! - - let account = self.accounts[indexPath.section][indexPath.row] - cell.textLabel?.text = account.name - cell.detailTextLabel?.text = "\(account.friends) friends" - - return cell - } - - - // MARK: UITableViewDelegate - - override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { - - let account = self.accounts[indexPath.section][indexPath.row] - self.updateDetails(account: account) - } - - override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - - switch section { - - case 0: - let count = self.accounts[section].count - return "Facebook Accounts (\(count) users)" - - case 1: - let count = self.accounts[section].count - return "Twitter Accounts (\(count) users)" - - default: - return nil - } - } - - - // MARK: Private - - @IBOutlet private dynamic weak var accountTypeLabel: UILabel? - @IBOutlet private dynamic weak var nameLabel: UILabel? - @IBOutlet private dynamic weak var friendsLabel: UILabel? - - private func updateDetails(account: UserAccount) { - - self.accountTypeLabel?.text = account.accountType - self.nameLabel?.text = account.name - self.friendsLabel?.text = "\(account.friends) friends" - } -} diff --git a/LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift b/LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift deleted file mode 100644 index b3e1e57..0000000 --- a/LegacyDemo/LegacyDemo/Stack Setup Demo/UserAccount.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// UserAccount.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData - - -// MARK: - UserAccount - -class UserAccount: NSManagedObject { - - @NSManaged var accountType: String? - @NSManaged var name: String? - @NSManaged var friends: Int32 -} diff --git a/LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents b/LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents deleted file mode 100644 index 71bef7a..0000000 --- a/LegacyDemo/LegacyDemo/StackSetupDemo.xcdatamodeld/StackSetupDemo.xcdatamodel/contents +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift deleted file mode 100644 index d1c6fe7..0000000 --- a/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIContainerViewController.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// SwiftUIContainerViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2019/10/02. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -import UIKit -import CoreStore - -#if canImport(SwiftUI) -import SwiftUI - -#endif - -#if canImport(Combine) -import Combine - -#endif - -import Compression -final class SwiftUIContainerViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - #if canImport(SwiftUI) && canImport(Combine) - - if #available(iOS 13, *) { - - let hostingController = UIHostingController( - rootView: SwiftUIView( - palettes: ColorsDemo.stack.publishList( - From() - .sectionBy(\.$colorName) - .orderBy(.ascending(\.$hue)) - ) - ) - .environment(\.dataStack, ColorsDemo.stack) - ) - self.addChild(hostingController) - - hostingController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight] - hostingController.view.frame = self.view.bounds.inset(by: self.view.safeAreaInsets) - self.view.addSubview(hostingController.view) - - hostingController.didMove(toParent: self) - } - - #endif - } -} diff --git a/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift b/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift deleted file mode 100644 index d8e41ab..0000000 --- a/LegacyDemo/LegacyDemo/SwiftUI Demo/SwiftUIView.swift +++ /dev/null @@ -1,183 +0,0 @@ -// -// SwiftUIView.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2019/10/02. -// Copyright © 2019 John Rommel Estropia. All rights reserved. -// - -#if canImport(SwiftUI) && canImport(Combine) -import SwiftUI -import Combine - -import CoreStore - - -@available(iOS 13.0.0, *) -struct SwiftUIView: View { - - @Environment(\.dataStack) - var dataStack: DataStack - - @ObservedObject - var palettes: ListPublisher - - var body: some View { - NavigationView { - List { - ForEach(palettes.snapshot.sectionIDs, id: \.self) { (sectionID) in - Section(header: Text(sectionID)) { - ForEach(self.palettes.snapshot.items(inSectionWithID: sectionID), id: \.self) { palette in - NavigationLink( - destination: DetailView(palette: palette), - label: { ColorCell(palette: palette) } - ) - } - .onDelete { itemIndices in - let objectIDsToDelete = self.palettes.snapshot.itemIDs( - inSectionWithID: sectionID, - atIndices: itemIndices - ) - self.dataStack.perform( - asynchronous: { transaction in - - transaction.delete(objectIDs: objectIDsToDelete) - }, - completion: { _ in } - ) - } - } - } - } - .navigationBarTitle(Text("SwiftUI (\(palettes.snapshot.numberOfItems) objects)")) - .navigationBarItems( - leading: EditButton(), - trailing: HStack { - Button( - action: { - - self.dataStack.perform( - asynchronous: { transaction in - - for palette in try transaction.fetchAll(From()) { - - palette.hue = Palette.randomHue() - palette.colorName = nil - } - }, - completion: { _ in } - ) - }, - label: { - Image(systemName: "goforward") - } - ) - .frame(width: 30) - Button( - action: { - - self.dataStack.perform( - asynchronous: { transaction in - - _ = transaction.create(Into()) - }, - completion: { _ in } - ) - }, - label: { - Image(systemName: "plus") - } - ) - .frame(width: 30) - } - ) - .alert( - isPresented: $needsShowAlert, - content: { - Alert( - title: Text("SwiftUI Binding Demo"), - message: Text("This demo shows how to bind to ListPublisher and to CoreStoreObject when using SwiftUI"), - dismissButton: .cancel(Text("OK")) - ) - } - ) - .onAppear { - - self.needsShowAlert = true - } - } - } - - @State - private var needsShowAlert = false -} - -@available(iOS 13.0.0, *) -struct ColorCell: View { - - @ObservedObject - var palette: ObjectPublisher - - var body: some View { - HStack { - Color(palette.color ?? UIColor.clear) - .cornerRadius(5) - .frame(width: 30, height: 30, alignment: .leading) - Text(palette.colorText ?? "") - } - } -} - -@available(iOS 13.0.0, *) -struct DetailView: View { - - @Environment(\.dataStack) - var dataStack: DataStack - - @ObservedObject - var palette: ObjectPublisher - - @State var hue: Float = 0 - @State var saturation: Float = 0 - @State var brightness: Float = 0 - - init(palette: ObjectPublisher) { - - self.palette = palette - self.hue = Float(palette.hue ?? 0) - self.saturation = palette.saturation ?? 0 - self.brightness = palette.brightness ?? 0 - } - - var body: some View { - ZStack { - Color(palette.color ?? UIColor.clear) - .cornerRadius(20) - .padding(20) - VStack { - Text(palette.colorText ?? "") - .navigationBarTitle(Text("Color")) - Slider(value: $hue, in: 0.0 ... 359.0 as ClosedRange) - Slider(value: $saturation, in: 0.0 ... 1.0 as ClosedRange) - Slider(value: $brightness, in: 0.0 ... 0.1 as ClosedRange) - } - } - } -} - -@available(iOS 13.0.0, *) -struct SwiftUIView_Previews: PreviewProvider { - - static var previews: some View { - SwiftUIView( - palettes: ColorsDemo.stack.publishList( - From() - .sectionBy(\.$colorName) - .orderBy(.ascending(\.$hue)) - ) - ) - .environment(\.dataStack, ColorsDemo.stack) - } -} - -#endif diff --git a/LegacyDemo/LegacyDemo/Transactions Demo/Place.swift b/LegacyDemo/LegacyDemo/Transactions Demo/Place.swift deleted file mode 100644 index 37670f2..0000000 --- a/LegacyDemo/LegacyDemo/Transactions Demo/Place.swift +++ /dev/null @@ -1,50 +0,0 @@ -// -// Place.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import Foundation -import CoreData -import MapKit - - -// MARK: - Place - -class Place: NSManagedObject, MKAnnotation { - - @NSManaged var latitude: Double - @NSManaged var longitude: Double - @NSManaged var title: String? - @NSManaged var subtitle: String? - - func setInitialValues() { - - self.latitude = Double(arc4random_uniform(180)) - 90 - self.longitude = Double(arc4random_uniform(360)) - 180 - self.title = "\(self.latitude), \(self.longitude)" - self.subtitle = nil - } - - // MARK: MKAnnotation - - var coordinate: CLLocationCoordinate2D { - - get { - - return CLLocationCoordinate2DMake( - self.latitude, - self.longitude - ) - } - set { - - self.latitude = newValue.latitude - self.longitude = newValue.longitude - self.title = "\(self.latitude), \(self.longitude)" - self.subtitle = nil - } - } -} diff --git a/LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift b/LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift deleted file mode 100644 index abd270b..0000000 --- a/LegacyDemo/LegacyDemo/Transactions Demo/TransactionsDemoViewController.swift +++ /dev/null @@ -1,233 +0,0 @@ -// -// TransactionsDemoViewController.swift -// LegacyDemo -// -// Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2018 John Rommel Estropia. All rights reserved. -// - -import UIKit -import Contacts -import CoreLocation -import MapKit -import AddressBookUI -import CoreStore - - -private struct Static { - - static let dataStack = DataStack() - - static let placeController: ObjectMonitor = { - - try! Static.dataStack.addStorageAndWait( - SQLiteStore( - fileName: "PlaceDemo.sqlite", - configuration: "TransactionsDemo", - localStorageOptions: .recreateStoreOnModelMismatch - ) - ) - - var place = try! Static.dataStack.fetchOne(From()) - if place == nil { - - _ = try? Static.dataStack.perform( - synchronous: { (transaction) in - - let place = transaction.create(Into()) - place.setInitialValues() - } - ) - place = try! Static.dataStack.fetchOne(From()) - } - - return Static.dataStack.monitorObject(place!) - }() -} - - -// MARK: - TransactionsDemoViewController - -class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, ObjectObserver { - - // MARK: NSObject - - deinit { - - Static.placeController.removeObserver(self) - } - - - // MARK: UIViewController - - override func viewDidLoad() { - - super.viewDidLoad() - - let longPressGesture = UILongPressGestureRecognizer( - target: self, - action: #selector(self.longPressGestureRecognized(_:)) - ) - self.mapView?.addGestureRecognizer(longPressGesture) - - Static.placeController.addObserver(self) - - self.navigationItem.rightBarButtonItem = UIBarButtonItem( - barButtonSystemItem: .refresh, - target: self, - action: #selector(self.refreshButtonTapped(_:)) - ) - } - - override func viewDidAppear(_ animated: Bool) { - - super.viewDidAppear(animated) - - let alert = UIAlertController( - title: "Transactions Demo", - message: "This demo shows how to use the 3 types of transactions to save updates: synchronous, asynchronous, and unsafe.\n\nTap and hold on the map to change the pin location.", - preferredStyle: .alert - ) - alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil)) - self.present(alert, animated: true, completion: nil) - } - - override func viewWillAppear(_ animated: Bool) { - - super.viewWillAppear(animated) - - if let mapView = self.mapView, let place = Static.placeController.object { - - mapView.addAnnotation(place) - mapView.setCenter(place.coordinate, animated: false) - mapView.selectAnnotation(place, animated: false) - } - } - - - // MARK: MKMapViewDelegate - - func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? { - - let identifier = "MKAnnotationView" - var annotationView: MKPinAnnotationView! = mapView.dequeueReusableAnnotationView(withIdentifier: identifier) as? MKPinAnnotationView - if annotationView == nil { - - annotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: identifier) - annotationView.isEnabled = true - annotationView.canShowCallout = true - annotationView.animatesDrop = true - } - else { - - annotationView.annotation = annotation - } - - return annotationView - } - - - // MARK: ObjectObserver - - func objectMonitor(_ monitor: ObjectMonitor, willUpdateObject object: Place) { - - // none - } - - func objectMonitor(_ monitor: ObjectMonitor, didUpdateObject object: Place, changedPersistentKeys: Set) { - - if let mapView = self.mapView { - - mapView.removeAnnotations(mapView.annotations) - mapView.addAnnotation(object) - mapView.setCenter(object.coordinate, animated: true) - mapView.selectAnnotation(object, animated: true) - - if changedPersistentKeys.contains(#keyPath(Place.latitude)) || changedPersistentKeys.contains(#keyPath(Place.longitude)) { - - self.geocode(place: object) - } - } - } - - func objectMonitor(_ monitor: ObjectMonitor, didDeleteObject object: Place) { - - // none - } - - - // MARK: Private - - var geocoder: CLGeocoder? - - @IBOutlet weak var mapView: MKMapView? - - @IBAction dynamic func longPressGestureRecognized(_ sender: AnyObject?) { - - if let mapView = self.mapView, - let gesture = sender as? UILongPressGestureRecognizer, - gesture.state == .began { - - let coordinate = mapView.convert( - gesture.location(in: mapView), - toCoordinateFrom: mapView - ) - Static.dataStack.perform( - asynchronous: { (transaction) in - - let place = transaction.edit(Static.placeController.object) - place?.coordinate = coordinate - }, - completion: { _ in } - ) - } - } - - @IBAction dynamic func refreshButtonTapped(_ sender: AnyObject?) { - - _ = try? Static.dataStack.perform( - synchronous: { (transaction) in - - let place = transaction.edit(Static.placeController.object) - place?.setInitialValues() - } - ) - } - - func geocode(place: Place) { - - let transaction = Static.dataStack.beginUnsafe() - - self.geocoder?.cancelGeocode() - - let geocoder = CLGeocoder() - self.geocoder = geocoder - geocoder.reverseGeocodeLocation( - CLLocation(latitude: place.latitude, longitude: place.longitude), - completionHandler: { [weak self] (placemarks, error) -> Void in - - if let placemark = placemarks?.first, let dictionary = placemark.addressDictionary { - - let place = transaction.edit(Static.placeController.object) - place?.title = placemark.name - place?.subtitle = CNPostalAddressFormatter.string( - from: autoreleasepool { - - let address = CNMutablePostalAddress() - (dictionary["Street"] as? String).flatMap({ address.street = $0 }) - (dictionary["State"] as? String).flatMap({ address.state = $0 }) - (dictionary["City"] as? String).flatMap({ address.city = $0 }) - (dictionary["Country"] as? String).flatMap({ address.country = $0 }) - (dictionary["ZIP"] as? String).flatMap({ address.postalCode = $0 }) - return address - }, - style: .mailingAddress - ) - transaction.commit { (_) -> Void in } - } - - self?.geocoder = nil - } - ) - } -} diff --git a/Package.swift b/Package.swift index 5c074bb..5e523ff 100644 --- a/Package.swift +++ b/Package.swift @@ -45,8 +45,7 @@ let package = Package( .testTarget( name: "CoreStoreTests", dependencies: ["CoreStore"], - path: "CoreStoreTests", - exclude: ["BridgingTests.h", "BridgingTests.m"] + path: "CoreStoreTests" ) ], swiftLanguageVersions: [.v5] diff --git a/README.md b/README.md index 03926b3..11ca8a6 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,12 @@ Unleashing the real power of Core Data with the elegance and safety of Swift

Contact
Join us on Slack! Reach me on Twitter! +Sponsor

-* **Swift 5.4:** iOS 11+ / macOS 10.13+ / watchOS 4.0+ / tvOS 11.0+ -* Previously supported Swift versions: [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1), [Swift 5.0](https://github.com/JohnEstropia/CoreStore/tree/6.3.2), [Swift 5.1](https://github.com/JohnEstropia/CoreStore/tree/7.0.4), [Swift 5.3](https://github.com/JohnEstropia/CoreStore/tree/7.3.1) +* **Swift 5.5:** iOS 11+ / macOS 10.13+ / watchOS 4.0+ / tvOS 11.0+ +* Previously supported Swift versions: [Swift 5.4](https://github.com/JohnEstropia/CoreStore/tree/8.0.1), [Swift 5.3](https://github.com/JohnEstropia/CoreStore/tree/7.3.1), [Swift 5.1](https://github.com/JohnEstropia/CoreStore/tree/7.0.4), [Swift 5.0](https://github.com/JohnEstropia/CoreStore/tree/6.3.2), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1), [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3) Upgrading from previous CoreStore versions? Check out the [🆕 features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases). @@ -67,7 +68,6 @@ CoreStore is part of the [Swift Source Compatibility projects](https://swift.org - [Observe a single object's per-property updates](#observe-a-single-objects-per-property-updates) - [Observe a diffable list](#observe-a-diffable-list) - [Observe detailed list changes](#observe-detailed-list-changes) - - [Objective-C support](#objective-c-support) - [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects) - [New `@Field` Property Wrapper syntax](#new-field-property-wrapper-syntax) - [`@Field.Stored` ](#fieldstored) @@ -198,7 +198,6 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep - **🎯Free to name entities and their class names independently.** CoreStore gets around a restriction with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you can assign independent names for the entities and their class names. - **📙Full Documentation.** No magic here; all public classes, functions, properties, etc. have detailed *Apple Docs*. This *README* also introduces a lot of concepts and explains a lot of CoreStore's behavior. - **ℹ️Informative (and pretty) logs.** All CoreStore and Core Data-related types now have very informative and pretty print outputs! *(See [Logging and error reporting](#logging-and-error-reporting))* -- **🎗Objective-C support!** Is your project transitioning from Objective-C to Swift but still can't quite fully convert some huge classes to Swift yet? CoreStore adjusts to the ever-increasing Swift adoption. While still written in pure Swift, all CoreStore types have their corresponding Objective-C-visible "bridging classes". *(See [Objective-C support](#objective-c-support))* - **🛡More extensive Unit Tests.** Extending CoreStore is safe without having to worry about breaking old behavior. *Have ideas that may benefit other Core Data users? [Feature Request](https://github.com/JohnEstropia/CoreStore/issues)s are welcome!* @@ -1676,111 +1675,6 @@ let person2 = self.monitor[1, 2] // person1 and person2 are the same object ``` -## Objective-C support -> ⚠️Objective-C support is planned to be deprecated in a future CoreStore version. - -All CoreStore types are still written in pure Swift, but most core types have Objective-C "bridging classes" that are visible to Objective-C code. To show a couple of usage examples: - - - - - - - - - - - -
SwiftObjective-C
-try dataStack.addStorageAndWait(SQLiteStore.self)
-
-NSError *error
-[CSCoreStore addSQLiteStorageAndWait:[CSSQLiteStore new] error:&error]
-
-dataStack.perform(
-    asynchronous: { (transaction) in
-        // ...
-    },
-    completion: { (result) in
-        switch result {
-        case .success: print("Done")
-        case .failure(let error): print(error)
-        }
-    }
-)
-
-[CSCoreStore beginAsynchronous:^(CSAsynchronousDataTransaction *transaction) {
-    // ...
-    [transaction 
-     commitWithSuccess:^{
-        NSLog(@"Done");
-     }
-     failure: ^(CSError *error) {
-        NSLog(@"error: %@", result.error);
-     }];
-}];
-
- -All of these `CS`-prefixed bridging classes have very similar usage to the existing CoreStore APIs, and ironically *none of them are written in Objective-C*. This is very different to the common approach where apps and libraries write Objective-C APIs just to support both Objective-C and Swift. The advantage with CoreStore's approach is that your Swift codebase can already use the purely-Swift API without further changes in the future, but your "hybrid" codebase can still bridge instances back and forth from Objective-C to Swift. - -For example, you may have a new, modern Swift class that holds a `ListMonitor`: -```swift -class MyViewController: UIViewController { - let monitor = dataStack.monitorList(From(), ...) - // ... -} -``` -Now let's say you have a legacy Objective-C class that previously uses `NSFetchedResultsController`. It's easy to switch from `NSFetchedResultsController` to `CSListMonitor`, but converting the rest of this huge class is impractical. You end up with -```objc -@interface MYOldViewController: UIViewController -@property (nonatomic, readonly, strong) CSListMonitor* monitor; -- (instancetype)initWithMonitor:(CSListMonitor *)monitor; -@end -``` -When you need to instantiate this class from Swift, you just call `bridgeToObjectiveC`: -```swift -class MyViewController: UIViewController { - let monitor = dataStack.monitorList(From(), ...) - func showOldController() { - let controller = MYOldViewController(monitor: self.monitor.bridgeToObjectiveC) - self.presentViewController(controller, animated: true, completion: nil) - } -} -``` -Note that the `CSListMonitor` holds the exact same `ListMonitor` instance, which means that no copies and no extra fetching occur. - -### Objective-C syntax sugars -Objective-C tends to be verbose, so some method calls are long and unreadable. For example, fetching looks like this: -```objc -NSArray *objects = -[CSCoreStore - fetchAllFrom:[[CSFrom alloc] initWithEntityClass:[MYPerson class]] - fetchClauses:@[[[CSWhere alloc] initWithFormat:@"%K == %@", @"isHidden", @NO], - [[CSOrderBy alloc] initWithSortDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"lastName" ascending:YES], - [NSSortDescriptor sortDescriptorWithKey:@"firstName" ascending:YES]]]]]; -``` -Although it works, it looks terrible. For this, CoreStore provides *CoreStoreBridge.h* where these Objective-C calls are wrapped in readable, convenient macros and global functions. The call above becomes -```objc -NSArray *objects = -[CSCoreStore - fetchAllFrom:CSFromClass([MYPerson class]) - fetchClauses:@[CSWhereFormat(@"%K == %@", @"isHidden", @NO), - CSOrderByKeys(CSSortAscending(@"lastName"), - CSSortAscending(@"firstName"), nil)]]; -``` -That's much shorter now. But we can still do better. Notice that we have strings being used as key paths. The `CSKeyPath(...)` macro gives us compile-time checking so keys that don't exist in a class will generate errors. Our key-safe code now looks like this: -```objc -NSArray *objects = -[CSCoreStore - fetchAllFrom:CSFromClass([MYPerson class]) - fetchClauses:@[CSWhereFormat(@"%K == %@", CSKeyPath(MYPerson, isHidden), @NO), - CSOrderByKeys(CSSortAscending(CSKeyPath(MYPerson, lastName)), - CSSortAscending(CSKeyPath(MYPerson, firstName)), nil)]]; -``` - -To use these syntax sugars, include *CoreStoreBridge.h* in your Objective-C source files. - - ## Type-safe `CoreStoreObject`s Starting CoreStore 4.0, we can now create persisted objects without depending on *.xcdatamodeld* Core Data files. The new `CoreStoreObject` subclass replaces `NSManagedObject`, and specially-typed properties declared on these classes will be synthesized as Core Data attributes. ```swift @@ -2593,13 +2487,9 @@ From the **File** - **Swift Packages** - **Add Package Dependency…** menu, sea ``` CoreStore ``` -where `JohnEstropia` is the *Owner* (forks may appear as well). Then add to your project. +where `JohnEstropia` is the *Owner* (forks may appear as well). Then add to your project -### Objective-C support - -To use the Objective-C syntax sugars, import *CoreStoreBridge.h* in your *.m* source files. - # Changesets For the full Changelog, refer to the [Releases](https://github.com/JohnEstropia/CoreStore/releases) page. diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift index 874f098..fd6f304 100644 --- a/Sources/AsynchronousDataTransaction.swift +++ b/Sources/AsynchronousDataTransaction.swift @@ -158,9 +158,19 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { // MARK: Internal - internal init(mainContext: NSManagedObjectContext, queue: DispatchQueue) { + internal init( + mainContext: NSManagedObjectContext, + queue: DispatchQueue, + sourceIdentifier: Any? + ) { - super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false) + super.init( + mainContext: mainContext, + queue: queue, + supportsUndo: false, + bypassesQueueing: false, + sourceIdentifier: sourceIdentifier + ) } internal func autoCommit(_ completion: @escaping (_ hasChanges: Bool, _ error: CoreStoreError?) -> Void) { @@ -168,12 +178,15 @@ public final class AsynchronousDataTransaction: BaseDataTransaction { self.isCommitted = true let group = DispatchGroup() group.enter() - self.context.saveAsynchronouslyWithCompletion { (hasChanges, error) -> Void in - - completion(hasChanges, error) - self.result = (hasChanges, error) - group.leave() - } + self.context.saveAsynchronously( + sourceIdentifier: self.sourceIdentifier, + completion: { (hasChanges, error) -> Void in + + completion(hasChanges, error) + self.result = (hasChanges, error) + group.leave() + } + ) group.wait() self.context.reset() } diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift index 66279ef..8dc6b0a 100644 --- a/Sources/BaseDataTransaction.swift +++ b/Sources/BaseDataTransaction.swift @@ -412,6 +412,11 @@ public /*abstract*/ class BaseDataTransaction { // MARK: 3rd Party Utilities + /** + An arbitrary value that identifies the source of this transaction. Callers of the transaction can provide this value through the `DataStack.perform(...)` methods. + */ + public let sourceIdentifier: Any? + /** Allow external libraries to store custom data in the transaction. App code should rarely have a need for this. ``` @@ -438,7 +443,13 @@ public /*abstract*/ class BaseDataTransaction { internal var isCommitted = false internal var result: (hasChanges: Bool, error: CoreStoreError?)? - internal init(mainContext: NSManagedObjectContext, queue: DispatchQueue, supportsUndo: Bool, bypassesQueueing: Bool) { + internal init( + mainContext: NSManagedObjectContext, + queue: DispatchQueue, + supportsUndo: Bool, + bypassesQueueing: Bool, + sourceIdentifier: Any? + ) { let context = mainContext.temporaryContextInTransactionWithConcurrencyType( queue == .main @@ -449,6 +460,7 @@ public /*abstract*/ class BaseDataTransaction { self.context = context self.supportsUndo = supportsUndo self.bypassesQueueing = bypassesQueueing + self.sourceIdentifier = sourceIdentifier context.parentTransaction = self context.isTransactionContext = true diff --git a/Sources/CSAsynchronousDataTransaction.swift b/Sources/CSAsynchronousDataTransaction.swift index 9e39fb3..388a860 100644 --- a/Sources/CSAsynchronousDataTransaction.swift +++ b/Sources/CSAsynchronousDataTransaction.swift @@ -29,113 +29,55 @@ import CoreData // MARK: - CSAsynchronousDataTransaction -/** - The `CSAsynchronousDataTransaction` serves as the Objective-C bridging type for `AsynchronousDataTransaction`. - - - SeeAlso: `AsynchronousDataTransaction` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreStoreObjectiveCType { - - /** - Saves the transaction changes. This method should not be used after the `-commitWithCompletion:` method was already called once. - - - parameter success: the block executed if the save succeeds. - - parameter failure: the block executed if the save fails. A `CSError` is reported as the argument of the block. - */ + @objc public func commitWithSuccess(_ success: (() -> Void)?, failure: ((CSError) -> Void)?) { - - Internals.assert( - self.bridgeToSwift.transactionQueue.cs_isCurrentExecutionContext(), - "Attempted to commit a \(Internals.typeName(self)) outside its designated queue." - ) - Internals.assert( - !self.bridgeToSwift.isCommitted, - "Attempted to commit a \(Internals.typeName(self)) more than once." - ) - self.bridgeToSwift.autoCommit { (_, error) in - - if let error = error { - - failure?(error.bridgeToObjectiveC) - } - else { - - success?() - } - } + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } // MARK: BaseDataTransaction - - /** - Creates a new `NSManagedObject` with the specified entity type. - - - parameter into: the `CSInto` clause indicating the destination `NSManagedObject` entity type and the destination configuration - - returns: a new `NSManagedObject` instance of the specified entity type. - */ + @objc public override func createInto(_ into: CSInto) -> Any { - - return self.bridgeToSwift.create(into.bridgeToSwift) + + fatalError() } - - /** - Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `-commitWithCompletion:` method was already called once. - - - parameter object: the `NSManagedObject` type to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ + @objc public override func editObject(_ object: NSManagedObject?) -> Any? { - - return self.bridgeToSwift.edit(object) + + fatalError() } - - /** - Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `-commitWithCompletion:` method was already called once. - - - parameter into: a `CSInto` clause specifying the entity type - - parameter objectID: the `NSManagedObjectID` for the object to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ + @objc public override func editInto(_ into: CSInto, objectID: NSManagedObjectID) -> Any? { - - return self.bridgeToSwift.edit(into.bridgeToSwift, objectID) + + fatalError() } - - /** - Deletes a specified `NSManagedObject`. This method should not be used after the `-commitWithCompletion:` method was already called once. - - - parameter object: the `NSManagedObject` type to be deleted - */ + @objc public override func deleteObject(_ object: NSManagedObject?) { - - self.bridgeToSwift.delete(object) + + fatalError() } - - /** - Deletes the specified `NSManagedObject`s. - - - parameter objects: the `NSManagedObject`s type to be deleted - */ + @objc public override func deleteObjects(_ objects: [NSManagedObject]) { - - self.bridgeToSwift.delete(objects) + + fatalError() } @@ -144,31 +86,26 @@ public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreSto public typealias SwiftType = AsynchronousDataTransaction public var bridgeToSwift: AsynchronousDataTransaction { - - return super.swiftTransaction as! AsynchronousDataTransaction + + fatalError() } public required init(_ swiftValue: AsynchronousDataTransaction) { - - super.init(swiftValue as BaseDataTransaction) - } - - public required override init(_ swiftValue: BaseDataTransaction) { - - super.init(swiftValue) + + fatalError() } } // MARK: - AsynchronousDataTransaction -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension AsynchronousDataTransaction: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSAsynchronousDataTransaction { - - return CSAsynchronousDataTransaction(self) + + fatalError() } } diff --git a/Sources/CSBaseDataTransaction+Querying.swift b/Sources/CSBaseDataTransaction+Querying.swift index d993df4..a664900 100644 --- a/Sources/CSBaseDataTransaction+Querying.swift +++ b/Sources/CSBaseDataTransaction+Querying.swift @@ -29,167 +29,66 @@ import CoreData // MARK: - CSBaseDataTransaction +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CSBaseDataTransaction { - - /** - Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context. - - - parameter object: a reference to the object created/fetched outside the transaction - - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found. - */ + @objc public func fetchExistingObject(_ object: NSManagedObject) -> Any? { - - return self.swiftTransaction.context.fetchExisting(object) as NSManagedObject? + + fatalError() } - - /** - Fetches the `NSManagedObject` instance in the transaction's context from an `NSManagedObjectID`. - - - parameter objectID: the `NSManagedObjectID` for the object - - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found. - */ + @objc public func fetchExistingObjectWithID(_ objectID: NSManagedObjectID) -> Any? { - - return self.swiftTransaction.context.fetchExisting(objectID) as NSManagedObject? + + fatalError() } - - /** - Fetches the `NSManagedObject` instances in the transaction's context from references created from a transaction or from a different managed object context. - - - parameter objects: an array of `NSManagedObject`s created/fetched outside the transaction - - returns: the `NSManagedObject` array for objects that exists in the transaction - */ + @objc public func fetchExistingObjects(_ objects: [NSManagedObject]) -> [Any] { - - return self.swiftTransaction.context.fetchExisting(objects) as [NSManagedObject] + + fatalError() } - - /** - Fetches the `NSManagedObject` instances in the transaction's context from a list of `NSManagedObjectID`. - - - parameter objectIDs: the `NSManagedObjectID` array for the objects - - returns: the `NSManagedObject` array for objects that exists in the transaction - */ + @objc public func fetchExistingObjectsWithIDs(_ objectIDs: [NSManagedObjectID]) -> [Any] { - - return self.swiftTransaction.context.fetchExisting(objectIDs) as [NSManagedObject] + + fatalError() } - - /** - Fetches the first `NSManagedObject` instance that satisfies the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `From` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the first `NSManagedObject` instance that satisfies the specified `CSFetchClause`s - */ + @objc public func fetchOneFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> Any? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.fetchOne(from, fetchClauses))? - .flatMap({ $0 }) + + fatalError() } - - /** - Fetches all `NSManagedObject` instances that satisfy the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: all `NSManagedObject` instances that satisfy the specified `CSFetchClause`s - */ + @objc public func fetchAllFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [Any]? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.fetchAll(from, fetchClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Fetches the number of `NSManagedObject`s that satisfy the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the number `NSManagedObject`s that satisfy the specified `CSFetchClause`s - */ + @objc public func fetchCountFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSNumber? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.fetchCount(from, fetchClauses)) - .flatMap({ NSNumber(value: $0) }) + + fatalError() } - - /** - Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `CSFetchClause`s - */ + @objc public func fetchObjectIDFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSManagedObjectID? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.fetchObjectID(from, fetchClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Queries aggregate values as specified by the `CSQueryClause`s. Requires at least a `CSSelect` clause, and optional `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter selectClause: a `CSSelect` clause indicating the properties to fetch, and with the generic type indicating the return type. - - parameter queryClauses: a series of `CSQueryClause` instances for the query request. Accepts `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - returns: the result of the the query. The type of the return value is specified by the generic type of the `CSSelect` parameter. - */ + @objc public func queryValueFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> Any? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to query from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.queryValue(from, selectClause, queryClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Queries a dictionary of attribute values as specified by the `CSQueryClause`s. Requires at least a `CSSelect` clause, and optional `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter selectClause: a `CSSelect` clause indicating the properties to fetch, and with the generic type indicating the return type. - - parameter queryClauses: a series of `CSQueryClause` instances for the query request. Accepts `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - returns: the result of the the query. The type of the return value is specified by the generic type of the `CSSelect` parameter. - */ + @objc public func queryAttributesFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> [[String: Any]]? { - - Internals.assert( - self.swiftTransaction.isRunningInAllowedQueue(), - "Attempted to query from a \(Internals.typeName(self)) outside its designated queue." - ) - return (try? self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses)) - .flatMap({ $0 }) + + fatalError() } } diff --git a/Sources/CSBaseDataTransaction.swift b/Sources/CSBaseDataTransaction.swift index c909e4b..483ecfc 100644 --- a/Sources/CSBaseDataTransaction.swift +++ b/Sources/CSBaseDataTransaction.swift @@ -29,226 +29,121 @@ import CoreData // MARK: - CSBaseDataTransaction -/** - The `CSBaseDataTransaction` serves as the Objective-C bridging type for `BaseDataTransaction`. - - - SeeAlso: `BaseDataTransaction` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public class CSBaseDataTransaction: NSObject { // MARK: Object management - - /** - Indicates if the transaction has pending changes - */ + @objc public var hasChanges: Bool { - - return self.swiftTransaction.hasChanges - } - - /** - Creates a new `NSManagedObject` with the specified entity type. - - - parameter into: the `CSInto` clause indicating the destination `NSManagedObject` entity type and the destination configuration - - returns: a new `NSManagedObject` instance of the specified entity type. - */ - @objc - public func createInto(_ into: CSInto) -> Any { - - return self.swiftTransaction.create(into.bridgeToSwift) - } - - /** - Returns an editable proxy of a specified `NSManagedObject`. - - - parameter object: the `NSManagedObject` type to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ - @objc - public func editObject(_ object: NSManagedObject?) -> Any? { - - return self.swiftTransaction.edit(object) - } - - /** - Returns an editable proxy of the object with the specified `NSManagedObjectID`. - - - parameter into: a `CSInto` clause specifying the entity type - - parameter objectID: the `NSManagedObjectID` for the object to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ - @objc - public func editInto(_ into: CSInto, objectID: NSManagedObjectID) -> Any? { - - return self.swiftTransaction.edit(into.bridgeToSwift, objectID) + + fatalError() + } + + @objc + public func createInto(_ into: CSInto) -> Any { + + fatalError() + } + + @objc + public func editObject(_ object: NSManagedObject?) -> Any? { + + fatalError() + } + + @objc + public func editInto(_ into: CSInto, objectID: NSManagedObjectID) -> Any? { + + fatalError() } - /** - Deletes a specified `NSManagedObject`. - - - parameter object: the `NSManagedObject` to be deleted - */ @objc public func deleteObject(_ object: NSManagedObject?) { - - self.swiftTransaction.delete(object) + + fatalError() } - - /** - Deletes the specified `NSManagedObject`s. - - - parameter objects: the `NSManagedObject`s to be deleted - */ + @objc public func deleteObjects(_ objects: [NSManagedObject]) { - - self.swiftTransaction.delete(objects) + + fatalError() } - - /** - Refreshes all registered objects `NSManagedObject`s in the transaction. - */ + @objc public func refreshAndMergeAllObjects() { - - self.swiftTransaction.refreshAndMergeAllObjects() + + fatalError() } // MARK: Inspecting Pending Objects - - /** - Returns all pending `NSManagedObject`s of the specified type that were inserted to the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: an `NSSet` of pending `NSManagedObject`s of the specified type that were inserted to the transaction. - */ + @objc public func insertedObjectsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.insertedObjects(entity) - } - - /** - Returns all pending `NSManagedObjectID`s that were inserted to the transaction. This method should not be called after the `-commit*:` method was called. - - - returns: an `NSSet` of pending `NSManagedObjectID`s that were inserted to the transaction. - */ - @objc - public func insertedObjectIDs() -> Set { - - return self.swiftTransaction.insertedObjectIDs() - } - - /** - Returns all pending `NSManagedObjectID`s of the specified type that were inserted to the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: an `NSSet` of pending `NSManagedObjectID`s of the specified type that were inserted to the transaction. - */ - @objc - public func insertedObjectIDsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.insertedObjectIDs(entity) - } - - /** - Returns all pending `NSManagedObject`s of the specified type that were updated in the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: an `NSSet` of pending `NSManagedObject`s of the specified type that were updated in the transaction. - */ - @objc - public func updatedObjectsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.updatedObjects(entity) - } - - /** - Returns all pending `NSManagedObjectID`s that were updated in the transaction. This method should not be called after the `-commit*:` method was called. - - - returns: an `NSSet` of pending `NSManagedObjectID`s that were updated in the transaction. - */ - @objc - public func updatedObjectIDs() -> Set { - - return self.swiftTransaction.updatedObjectIDs() - } - - /** - Returns all pending `NSManagedObjectID`s of the specified type that were updated in the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: an `NSSet` of pending `NSManagedObjectID`s of the specified type that were updated in the transaction. - */ - @objc - public func updatedObjectIDsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.updatedObjectIDs(entity) - } - - /** - Returns all pending `NSManagedObject`s of the specified type that were deleted from the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: an `NSSet` of pending `NSManagedObject`s of the specified type that were deleted from the transaction. - */ - @objc - public func deletedObjectsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.deletedObjects(entity) - } - - /** - Returns all pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. This method should not be called after the `-commit*:` method was called. - - - returns: an `NSSet` of pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. - */ - @objc - public func deletedObjectIDs() -> Set { - - return self.swiftTransaction.deletedObjectIDs() + + fatalError() + } + + @objc + public func insertedObjectIDs() -> Set { + + fatalError() + } + + @objc + public func insertedObjectIDsOfType(_ entity: NSManagedObject.Type) -> Set { + + fatalError() + } + + @objc + public func updatedObjectsOfType(_ entity: NSManagedObject.Type) -> Set { + + fatalError() + } + + @objc + public func updatedObjectIDs() -> Set { + + fatalError() + } + + @objc + public func updatedObjectIDsOfType(_ entity: NSManagedObject.Type) -> Set { + + fatalError() + } + + @objc + public func deletedObjectsOfType(_ entity: NSManagedObject.Type) -> Set { + + fatalError() + } + + @objc + public func deletedObjectIDs() -> Set { + + fatalError() } - /** - Returns all pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. This method should not be called after the `-commit*:` method was called. - - - parameter entity: the `NSManagedObject` subclass to filter - - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. - */ @objc public func deletedObjectIDsOfType(_ entity: NSManagedObject.Type) -> Set { - - return self.swiftTransaction.deletedObjectIDs(entity) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.swiftTransaction).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSBaseDataTransaction else { - - return false - } - return self.swiftTransaction === object.swiftTransaction - } - - - // MARK: Internal - - internal let swiftTransaction: BaseDataTransaction - - internal init(_ swiftValue: BaseDataTransaction) { - - self.swiftTransaction = swiftValue - super.init() + + fatalError() } } diff --git a/Sources/CSClauseTypes.swift b/Sources/CSClauseTypes.swift index c73a5c4..a5a5e71 100644 --- a/Sources/CSClauseTypes.swift +++ b/Sources/CSClauseTypes.swift @@ -29,11 +29,7 @@ import CoreData // MARK: - CSFetchClause -/** - The `CSFetchClause` implement clauses used to configure `NSFetchRequest`s. - - - SeeAlso: `FetchClause` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSFetchClause { @@ -44,11 +40,7 @@ public protocol CSFetchClause { // MARK: - CSQueryClause -/** - The `CSQueryClause` implement clauses used to configure `NSFetchRequest`s. - - - SeeAlso: `QueryClause` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSQueryClause { @@ -59,11 +51,7 @@ public protocol CSQueryClause { // MARK: - CSDeleteClause -/** - The `CSDeleteClause` implement clauses used to configure `NSFetchRequest`s. - - - SeeAlso: `DeleteClause` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSDeleteClause { diff --git a/Sources/CSCoreStore.swift b/Sources/CSCoreStore.swift index c07e675..fe3a41b 100644 --- a/Sources/CSCoreStore.swift +++ b/Sources/CSCoreStore.swift @@ -28,33 +28,14 @@ import Foundation // MARK: - CSCoreStore -/** - The `CSCoreStore` serves as the Objective-C bridging type for `CoreStore`. - - - SeeAlso: `CoreStore` - */ -@available(*, deprecated, message: "Call methods directly from the CSDataStack instead") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSCoreStore: NSObject { - - /** - The default `CSDataStack` instance to be used. If `defaultStack` is not set before the first time accessed, a default-configured `CSDataStack` will be created. - - - SeeAlso: `CSDataStack` - - Note: Changing the `defaultStack` is thread safe, but it is recommended to setup `CSDataStacks` on a common queue (e.g. the main queue). - */ + @objc public static var defaultStack: CSDataStack { - get { return CoreStoreDefaults.dataStack.bridgeToObjectiveC } - set { CoreStoreDefaults.dataStack = newValue.bridgeToSwift } - } - - - // MARK: Private - - private override init() { - - fatalError() + get { fatalError() } + set { fatalError() } } } diff --git a/Sources/CSDataStack+Migrating.swift b/Sources/CSDataStack+Migrating.swift index b3e95f2..047217e 100644 --- a/Sources/CSDataStack+Migrating.swift +++ b/Sources/CSDataStack+Migrating.swift @@ -29,99 +29,30 @@ import CoreData // MARK: - CSDataStack -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CSDataStack { - /** - Asynchronously adds a `CSInMemoryStore` to the stack. Migrations are also initiated by default. - ``` - NSError *error; - NSProgress *migrationProgress = [dataStack - addInMemoryStorage:[CSInMemoryStore new] - completion:^(CSSetupResult *result) { - if (result.isSuccess) { - // ... - } - } - error: &error]; - ``` - - parameter storage: the `CSInMemoryStore` instance - - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `CSSetupResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a failure `CSSetupResult` result if an error occurs asynchronously. - */ @objc public func addInMemoryStorage(_ storage: CSInMemoryStore, completion: @escaping (CSSetupResult) -> Void) { - - self.bridgeToSwift.addStorage( - storage.bridgeToSwift, - completion: { completion($0.bridgeToObjectiveC) } - ) + + fatalError() } - - /** - Asynchronously adds a `CSSQLiteStore` to the stack. Migrations are also initiated by default. - ``` - NSError *error; - NSProgress *migrationProgress = [dataStack - addInMemoryStorage:[[CSSQLiteStore alloc] - initWithFileName:@"core_data.sqlite" - configuration:@"Config1"] - completion:^(CSSetupResult *result) { - if (result.isSuccess) { - // ... - } - } - error: &error]; - ``` - - parameter storage: the `CSSQLiteStore` instance - - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `CSSetupResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a failure `CSSetupResult` result if an error occurs asynchronously. Note that the `CSLocalStorage` associated to the `-[CSSetupResult storage]` may not always be the same instance as the parameter argument if a previous `CSLocalStorage` was already added at the same URL and with the same configuration. - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: an `NSProgress` instance if a migration has started. `nil` if no migrations are required or if `error` was set. - */ + @objc public func addSQLiteStorage(_ storage: CSSQLiteStore, completion: @escaping (CSSetupResult) -> Void, error: NSErrorPointer) -> Progress? { - - return bridge(error) { - - self.bridgeToSwift.addStorage( - storage.bridgeToSwift, - completion: { completion($0.bridgeToObjectiveC) } - ) - } + + fatalError() } - - /** - Migrates a `CSSQLiteStore` to match the `CSDataStack`'s managed object model version. This method does NOT add the migrated store to the data stack. - - - parameter storage: the `CSSQLiteStore` instance - - parameter completion: the closure to be executed on the main queue when the migration completes, either due to success or failure. The closure's `CSMigrationResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a failure `CSSetupResult` result if an error occurs asynchronously. - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: an `NSProgress` instance if a migration has started. `nil` if no migrations are required or if `error` was set. - */ + @objc public func upgradeStorageIfNeeded(_ storage: CSSQLiteStore, completion: @escaping (CSMigrationResult) -> Void, error: NSErrorPointer) -> Progress? { - - return bridge(error) { - - try self.bridgeToSwift.upgradeStorageIfNeeded( - storage.bridgeToSwift, - completion: { completion($0.bridgeToObjectiveC) } - ) - } + + fatalError() } - - /** - Checks the migration steps required for the `CSSQLiteStore` to match the `CSDataStack`'s managed object model version. - - - parameter storage: the `CSSQLiteStore` instance - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: a `CSMigrationType` array indicating the migration steps required for the store, or an empty array if the file does not exist yet. Otherwise, `nil` is returned and the `error` argument is set if either inspection of the store failed, or if no mapping model was found/inferred. - */ + @objc public func requiredMigrationsForSQLiteStore(_ storage: CSSQLiteStore, error: NSErrorPointer) -> [CSMigrationType]? { - - return bridge(error) { - - try self.bridgeToSwift.requiredMigrationsForStorage(storage.bridgeToSwift) - } + + fatalError() } } diff --git a/Sources/CSDataStack+Observing.swift b/Sources/CSDataStack+Observing.swift index d0c2ff4..5b6d9cc 100644 --- a/Sources/CSDataStack+Observing.swift +++ b/Sources/CSDataStack+Observing.swift @@ -29,143 +29,35 @@ import CoreData // MARK: - CSDataStack -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CSDataStack { - /** - Creates a `CSObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`. - - - parameter object: the `NSManagedObject` to observe changes from - - returns: an `ObjectMonitor` that monitors changes to `object` - */ @objc public func monitorObject(_ object: NSManagedObject) -> CSObjectMonitor { - - return self.bridgeToSwift.monitorObject(object).bridgeToObjectiveC + + fatalError() } - - /** - Creates a `CSListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `CSListObserver`s may then register themselves to be notified when changes are made to the list. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: a `CSListMonitor` instance that monitors changes to the list - */ + @objc public func monitorListFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> CSListMonitor { - - Internals.assert( - Thread.isMainThread, - "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread." - ) - Internals.assert( - fetchClauses.contains { $0 is CSOrderBy }, - "A CSListMonitor requires a CSOrderBy clause." - ) - return ListMonitor( - dataStack: self.bridgeToSwift, - from: from.bridgeToSwift, - sectionBy: nil, - applyFetchClauses: { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } - ).bridgeToObjectiveC + + fatalError() } - - /** - Asynchronously creates a `CSListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `CSListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed. - - - parameter createAsynchronously: the closure that receives the created `CSListMonitor` instance - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for fetching the object list. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - */ + @objc public func monitorListByCreatingAsynchronously(_ createAsynchronously: @escaping (CSListMonitor) -> Void, from: CSFrom, fetchClauses: [CSFetchClause]) { - - Internals.assert( - Thread.isMainThread, - "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread." - ) - Internals.assert( - fetchClauses.contains { $0 is CSOrderBy }, - "A CSListMonitor requires an CSOrderBy clause." - ) - _ = ListMonitor( - dataStack: self.bridgeToSwift, - from: from.bridgeToSwift, - sectionBy: nil, - applyFetchClauses: { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - }, - createAsynchronously: { - - createAsynchronously($0.bridgeToObjectiveC) - } - ) + + fatalError() } - - /** - Creates a `CSListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter sectionBy: a `CSSectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections. - - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: a `CSListMonitor` instance that monitors changes to the list - */ + @objc public func monitorSectionedListFrom(_ from: CSFrom, sectionBy: CSSectionBy, fetchClauses: [CSFetchClause]) -> CSListMonitor { - - Internals.assert( - Thread.isMainThread, - "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread." - ) - Internals.assert( - fetchClauses.contains { $0 is CSOrderBy }, - "A CSListMonitor requires an CSOrderBy clause." - ) - return ListMonitor( - dataStack: self.bridgeToSwift, - from: from.bridgeToSwift, - sectionBy: sectionBy.bridgeToSwift, - applyFetchClauses: { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } - ).bridgeToObjectiveC + + fatalError() } - - /** - Asynchronously creates a `CSListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `CSListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed. - - - parameter createAsynchronously: the closure that receives the created `CSListMonitor` instance - - parameter from: a `CSFrom` clause indicating the entity type - - parameter sectionBy: a `CSSectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections. - - parameter fetchClauses: a series of `CSFetchClause` instances for fetching the object list. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - */ + public func monitorSectionedListByCreatingAsynchronously(_ createAsynchronously: @escaping (CSListMonitor) -> Void, from: CSFrom, sectionBy: CSSectionBy, fetchClauses: [CSFetchClause]) { - - Internals.assert( - Thread.isMainThread, - "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread." - ) - Internals.assert( - fetchClauses.contains { $0 is CSOrderBy }, - "A CSListMonitor requires an CSOrderBy clause." - ) - _ = ListMonitor( - dataStack: self.bridgeToSwift, - from: from.bridgeToSwift, - sectionBy: sectionBy.bridgeToSwift, - applyFetchClauses: { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - }, - createAsynchronously: { - - createAsynchronously($0.bridgeToObjectiveC) - } - ) + + fatalError() } } diff --git a/Sources/CSDataStack+Querying.swift b/Sources/CSDataStack+Querying.swift index 1c1a440..6877d92 100644 --- a/Sources/CSDataStack+Querying.swift +++ b/Sources/CSDataStack+Querying.swift @@ -29,186 +29,72 @@ import CoreData // MARK: - CSDataStack -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CSDataStack { - - /** - Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context. - - - parameter object: a reference to the object created/fetched outside the transaction - - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found. - */ + @objc public func fetchExistingObject(_ object: NSManagedObject) -> Any? { - - return self.bridgeToSwift.mainContext.fetchExisting(object) as NSManagedObject? + + fatalError() } - - /** - Fetches the `NSManagedObject` instance in the transaction's context from an `NSManagedObjectID`. - - - parameter objectID: the `NSManagedObjectID` for the object - - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found. - */ + @objc public func fetchExistingObjectWithID(_ objectID: NSManagedObjectID) -> Any? { - - return self.bridgeToSwift.mainContext.fetchExisting(objectID) as NSManagedObject? + + fatalError() } - - /** - Fetches the `NSManagedObject` instances in the transaction's context from references created from a transaction or from a different managed object context. - - - parameter objects: an array of `NSManagedObject`s created/fetched outside the transaction - - returns: the `NSManagedObject` array for objects that exists in the transaction - */ + @objc public func fetchExistingObjects(_ objects: [NSManagedObject]) -> [Any] { - - return self.bridgeToSwift.mainContext.fetchExisting(objects) as [NSManagedObject] + + fatalError() } - - /** - Fetches the `NSManagedObject` instances in the transaction's context from a list of `NSManagedObjectID`. - - - parameter objectIDs: the `NSManagedObjectID` array for the objects - - returns: the `NSManagedObject` array for objects that exists in the transaction - */ + @objc public func fetchExistingObjectsWithIDs(_ objectIDs: [NSManagedObjectID]) -> [Any] { - - return self.bridgeToSwift.mainContext.fetchExisting(objectIDs) as [NSManagedObject] + + fatalError() } - - /** - Fetches the first `NSManagedObject` instance that satisfies the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `From` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the first `NSManagedObject` instance that satisfies the specified `CSFetchClause`s - */ + @objc public func fetchOneFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> Any? { - - Internals.assert( - Thread.isMainThread, - "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses))? - .flatMap({ $0 }) + + fatalError() } - - /** - Fetches all `NSManagedObject` instances that satisfy the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: all `NSManagedObject` instances that satisfy the specified `CSFetchClause`s - */ + @objc public func fetchAllFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [Any]? { - - Internals.assert( - Thread.isMainThread, - "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Fetches the number of `NSManagedObject`s that satisfy the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the number `NSManagedObject`s that satisfy the specified `CSFetchClause`s - */ + @objc public func fetchCountFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSNumber? { - - Internals.assert( - Thread.isMainThread, - "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.fetchCount(from, fetchClauses)) - .flatMap({ NSNumber(value: $0) }) + + fatalError() } - - /** - Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `CSFetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `CSFetchClause`s - */ + @objc public func fetchObjectIDFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSManagedObjectID? { - - Internals.assert( - Thread.isMainThread, - "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses))? - .flatMap({ $0 }) + + fatalError() } - - /** - Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `CSFetchClause`s. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `CSWhere`, `CSOrderBy`, and `CSTweak` clauses. - - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `CSFetchClause`s - */ + @objc public func fetchObjectIDsFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [NSManagedObjectID]? { - - Internals.assert( - Thread.isMainThread, - "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Queries aggregate values as specified by the `CSQueryClause`s. Requires at least a `CSSelect` clause, and optional `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter selectClause: a `CSSelect` clause indicating the properties to fetch, and with the generic type indicating the return type. - - parameter queryClauses: a series of `CSQueryClause` instances for the query request. Accepts `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - returns: the result of the the query. The type of the return value is specified by the generic type of the `CSSelect` parameter. - */ + @objc public func queryValueFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> Any? { - - Internals.assert( - Thread.isMainThread, - "Attempted to query from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses)) - .flatMap({ $0 }) + + fatalError() } - - /** - Queries a dictionary of attribute values as specified by the `CSQueryClause`s. Requires at least a `CSSelect` clause, and optional `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result. - - - parameter from: a `CSFrom` clause indicating the entity type - - parameter selectClause: a `CSSelect` clause indicating the properties to fetch, and with the generic type indicating the return type. - - parameter queryClauses: a series of `CSQueryClause` instances for the query request. Accepts `CSWhere`, `CSOrderBy`, `CSGroupBy`, and `CSTweak` clauses. - - returns: the result of the the query. The type of the return value is specified by the generic type of the `CSSelect` parameter. - */ + @objc public func queryAttributesFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> [[String: Any]]? { - - Internals.assert( - Thread.isMainThread, - "Attempted to query from a \(Internals.typeName(self)) outside the main thread." - ) - return (try? self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses)) - .flatMap({ $0 }) + + fatalError() } } diff --git a/Sources/CSDataStack+Transaction.swift b/Sources/CSDataStack+Transaction.swift index e652e33..c8fc145 100644 --- a/Sources/CSDataStack+Transaction.swift +++ b/Sources/CSDataStack+Transaction.swift @@ -28,108 +28,36 @@ import Foundation // MARK: - CSDataStack -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CSDataStack { - - /** - Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made. - - - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`. - */ + @objc public func beginAsynchronous(_ closure: @escaping (_ transaction: CSAsynchronousDataTransaction) -> Void) { - - self.bridgeToSwift.perform( - asynchronous: { (transaction) in - - let csTransaction = transaction.bridgeToObjectiveC - closure(csTransaction) - if !transaction.isCommitted && transaction.hasChanges { - - Internals.log( - .warning, - message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded." - ) - } - try transaction.cancel() - }, - completion: { _ in } - ) + + fatalError() } - - /** - Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made. - - - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`. - - parameter error: the `CSError` pointer that indicates the reason in case of an failure - - returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information. - */ + @objc public func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void, error: NSErrorPointer) -> Bool { - - return bridge(error) { - - do { - - try self.bridgeToSwift.perform( - synchronous: { (transaction) in - - let csTransaction = transaction.bridgeToObjectiveC - closure(csTransaction) - if !transaction.isCommitted && transaction.hasChanges { - - Internals.log( - .warning, - message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded." - ) - } - try transaction.cancel() - } - ) - } - catch CoreStoreError.userCancelled { - - return - } - } + + fatalError() } - - /** - Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - To support "undo" methods such as `-undo`, `-redo`, and `-rollback`, use the `-beginSafeWithSupportsUndo:` method passing `YES` to the argument. Without "undo" support, calling those methods will raise an exception. - - returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made. - */ + @objc public func beginUnsafe() -> CSUnsafeDataTransaction { - - return bridge { - - self.bridgeToSwift.beginUnsafe() - } + + fatalError() } - - /** - Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - - prameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. - - returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made. - */ + @objc public func beginUnsafeWithSupportsUndo(_ supportsUndo: Bool) -> CSUnsafeDataTransaction { - - return bridge { - - self.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo) - } + + fatalError() } - - /** - Refreshes all registered objects `NSManagedObject`s in the `DataStack`. - */ + @objc public func refreshAndMergeAllObjects() { - - self.bridgeToSwift.refreshAndMergeAllObjects() + + fatalError() } } diff --git a/Sources/CSDataStack.swift b/Sources/CSDataStack.swift index d4878a1..b53c057 100644 --- a/Sources/CSDataStack.swift +++ b/Sources/CSDataStack.swift @@ -29,170 +29,84 @@ import CoreData // MARK: - CSDataStack -/** - The `CSDataStack` serves as the Objective-C bridging type for `DataStack`. - - - SeeAlso: `DataStack` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSDataStack: NSObject, CoreStoreObjectiveCType { - - /** - Initializes a `CSDataStack` with default settings. CoreStore searches for .xcdatamodeld from the main `NSBundle` and loads an `NSManagedObjectModel` from it. An assertion is raised if the model could not be found. - */ + @objc public convenience override init() { - self.init(DataStack()) + fatalError() } - - /** - Initializes a `CSDataStack` from the model with the specified `modelName` in the specified `bundle`. - - - parameter xcodeModelName: the name of the (.xcdatamodeld) model file. If not specified, the application name (CFBundleName) will be used if it exists, or "CoreData" if it the bundle name was not set. - - parameter bundle: an optional bundle to load .xcdatamodeld models from. If not specified, the main bundle will be used. - - parameter versionChain: the version strings that indicate the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack. - */ + @objc public convenience init(xcodeModelName: XcodeDataModelFileName?, bundle: Bundle?, versionChain: [String]?) { - - self.init( - DataStack( - xcodeModelName: xcodeModelName ?? DataStack.applicationName, - bundle: bundle ?? Bundle.main, - migrationChain: versionChain.flatMap { MigrationChain($0) } ?? nil - ) - ) + + fatalError() } - - /** - Returns the stack's model version. The version string is the same as the name of the version-specific .xcdatamodeld file. - */ + @objc public var modelVersion: String { - - return self.bridgeToSwift.modelVersion + + fatalError() } - - /** - Returns the entity name-to-class type mapping from the `CSDataStack`'s model. - */ + @objc public func entityTypesByNameForType(_ type: NSManagedObject.Type) -> [EntityName: NSManagedObject.Type] { - - return self.bridgeToSwift.entityTypesByName(for: type) + + fatalError() } - - /** - Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from stack's model. - */ + @objc public func entityDescriptionForClass(_ type: NSManagedObject.Type) -> NSEntityDescription? { - - return self.bridgeToSwift.entityDescription(for: type) + + fatalError() } - - /** - Creates an `CSInMemoryStore` with default parameters and adds it to the stack. This method blocks until completion. - ``` - CSSQLiteStore *storage = [dataStack addInMemoryStorageAndWaitAndReturnError:&error]; - ``` - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: the `CSInMemoryStore` added to the stack - */ + @objc @discardableResult public func addInMemoryStorageAndWaitAndReturnError(_ error: NSErrorPointer) -> CSInMemoryStore? { - - return bridge(error) { - - try self.bridgeToSwift.addStorageAndWait(InMemoryStore()) - } + + fatalError() } - - /** - Creates an `CSSQLiteStore` with default parameters and adds it to the stack. This method blocks until completion. - ``` - CSSQLiteStore *storage = [dataStack addSQLiteStorageAndWaitAndReturnError:&error]; - ``` - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: the `CSSQLiteStore` added to the stack - */ + @objc @discardableResult public func addSQLiteStorageAndWaitAndReturnError(_ error: NSErrorPointer) -> CSSQLiteStore? { - - return bridge(error) { - - try self.bridgeToSwift.addStorageAndWait(SQLiteStore()) - } + + fatalError() } - - /** - Adds a `CSInMemoryStore` to the stack and blocks until completion. - ``` - NSError *error; - CSInMemoryStore *storage = [dataStack - addStorageAndWait: [[CSInMemoryStore alloc] initWithConfiguration: @"Config1"] - error: &error]; - ``` - - parameter storage: the `CSInMemoryStore` - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: the `CSInMemoryStore` added to the stack - */ + @objc @discardableResult public func addInMemoryStorageAndWait(_ storage: CSInMemoryStore, error: NSErrorPointer) -> CSInMemoryStore? { - - return bridge(error) { - - try self.bridgeToSwift.addStorageAndWait(storage.bridgeToSwift) - } + + fatalError() } - - /** - Adds a `CSSQLiteStore` to the stack and blocks until completion. - ``` - NSError *error; - CSSQLiteStore *storage = [dataStack - addStorageAndWait: [[CSSQLiteStore alloc] initWithConfiguration: @"Config1"] - error: &error]; - ``` - - parameter storage: the `CSSQLiteStore` - - parameter error: the `NSError` pointer that indicates the reason in case of an failure - - returns: the `CSSQLiteStore` added to the stack - */ + @objc @discardableResult public func addSQLiteStorageAndWait(_ storage: CSSQLiteStore, error: NSErrorPointer) -> CSSQLiteStore? { - - return bridge(error) { - - try self.bridgeToSwift.addStorageAndWait(storage.bridgeToSwift) - } + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.bridgeToSwift).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSDataStack else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -201,22 +115,21 @@ public final class CSDataStack: NSObject, CoreStoreObjectiveCType { public let bridgeToSwift: DataStack public init(_ swiftValue: DataStack) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - DataStack -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension DataStack: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSDataStack { - - return CSDataStack(self) + + fatalError() } } diff --git a/Sources/CSDynamicSchema.swift b/Sources/CSDynamicSchema.swift index 735b0e0..43299b4 100644 --- a/Sources/CSDynamicSchema.swift +++ b/Sources/CSDynamicSchema.swift @@ -29,23 +29,13 @@ import Foundation // MARK: - CSDynamicSchema -/** - The `CSDynamicSchema` serves as the Objective-C bridging type for `DynamicSchema`. - - - SeeAlso: `DynamicSchema` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSDynamicSchema { - - /** - The version string for this model schema. - */ + @objc var modelVersion: ModelVersion { get } - /** - Do not call this directly. The `NSManagedObjectModel` for this schema may be created lazily and using this method directly may affect the integrity of the model. - */ @objc func rawModel() -> NSManagedObjectModel } diff --git a/Sources/CSError.swift b/Sources/CSError.swift index 96b5ad0..ff8954e 100644 --- a/Sources/CSError.swift +++ b/Sources/CSError.swift @@ -29,281 +29,75 @@ import CoreData // MARK: - CSError -/** - All errors thrown from CoreStore are expressed in `CSError`s. - - - SeeAlso: `CoreStoreError` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSError: NSError { - - /** - The `NSError` error domain for `CSError`. - - - SeeAlso: `CoreStoreErrorErrorDomain` - */ + + // MARK: Public + @objc public static let errorDomain = CoreStoreErrorDomain public var bridgeToSwift: CoreStoreError { - if let swift = self.swiftError { - - return swift - } - let swift = CoreStoreError(_bridgedNSError: self) ?? .unknown - self.swiftError = swift - return swift + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSError else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } - - /** - Do not call directly! - */ + public init(_ swiftValue: CoreStoreError) { - - self.swiftError = swiftValue - super.init(domain: CoreStoreError.errorDomain, code: swiftValue.errorCode, userInfo: swiftValue.errorUserInfo) + + fatalError() } public required init?(coder aDecoder: NSCoder) { - - super.init(coder: aDecoder) - } - - - // MARK: Private - - private var swiftError: CoreStoreError? -} -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -extension CSError: CoreStoreObjectiveCType {} + fatalError() + } +} // MARK: - CSErrorCode -/** - The `NSError` error codes for `CSError.Domain`. - - - SeeAlso: `CSError` - - SeeAlso: `CoreStoreError` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public enum CSErrorCode: Int { - - /** - A failure occured because of an unknown error. - */ + case unknownError - - /** - The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`. - */ case differentStorageExistsAtURL - - /** - An `NSMappingModel` could not be found for a specific source and destination model versions. - */ case mappingModelNotFound - - /** - Progressive migrations are disabled for a store, but an `NSMappingModel` could not be found for a specific source and destination model versions. - */ case progressiveMigrationRequired - - /** - An internal SDK call failed with the specified "NSError" userInfo key. - */ case internalError - - /** - The transaction was terminated by a user-thrown error with the specified "Error" userInfo key. - */ case userError - - /** - The transaction was cancelled by the user. - */ case userCancelled } // MARK: - CoreStoreError -extension CoreStoreError: _ObjectiveCBridgeableError { - - // MARK: _ObjectiveCBridgeableError - - public init?(_bridgedNSError error: NSError) { - - guard error.domain == CoreStoreErrorDomain else { - - if error is CSError { - - self = .internalError(NSError: error) - return - } - return nil - } - - guard let code = CoreStoreErrorCode(rawValue: error.code) else { - - if error is CSError { - - self = .unknown - return - } - return nil - } - - let info = error.userInfo - switch code { - - case .unknownError: - self = .unknown - - case .differentStorageExistsAtURL: - guard case let existingPersistentStoreURL as URL = info["existingPersistentStoreURL"] else { - - self = .unknown - return - } - self = .differentStorageExistsAtURL(existingPersistentStoreURL: existingPersistentStoreURL) - - case .mappingModelNotFound: - guard let localStoreURL = info["localStoreURL"] as? URL, - let targetModel = info["targetModel"] as? NSManagedObjectModel, - let targetModelVersion = info["targetModelVersion"] as? String else { - - self = .unknown - return - } - self = .mappingModelNotFound(localStoreURL: localStoreURL, targetModel: targetModel, targetModelVersion: targetModelVersion) - - case .progressiveMigrationRequired: - guard let localStoreURL = info["localStoreURL"] as? URL else { - - self = .unknown - return - } - self = .progressiveMigrationRequired(localStoreURL: localStoreURL) - - case .asynchronousMigrationRequired: - guard - let localStoreURL = info["localStoreURL"] as? URL, - case let nsError as NSError = info["NSError"] - else { - - self = .unknown - return - } - self = .asynchronousMigrationRequired(localStoreURL: localStoreURL, NSError: nsError) - - case .internalError: - guard case let nsError as NSError = info["NSError"] else { - - self = .unknown - return - } - self = .internalError(NSError: nsError) - - case .userError: - guard case let error as Error = info["Error"] else { - - self = .unknown - return - } - self = .userError(error: error) - - case .userCancelled: - self = .userCancelled - - case .persistentStoreNotFound: - guard let entity = info["entity"] as? DynamicObject.Type else { - - self = .unknown - return - } - self = .persistentStoreNotFound(entity: entity) - } - } -} - - -// MARK: - Error - -extension Error { - - // MARK: Internal - - internal var bridgeToSwift: CoreStoreError { - - switch self { - - case let error as CoreStoreError: - return error - - case let error as CSError: - return error.bridgeToSwift - - case let error as NSError where Self.self is NSError.Type: - return .internalError(NSError: error) - - default: - return .unknown - } - } - - @available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") - internal var bridgeToObjectiveC: NSError { - - switch self { - - case let error as CoreStoreError: - return error.bridgeToObjectiveC - - case let error as CSError: - return error - - default: - return self as NSError - } - } -} - - -// MARK: - CoreStoreError - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension CoreStoreError: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSError { - - return CSError(self) + + fatalError() } } diff --git a/Sources/CSFrom.swift b/Sources/CSFrom.swift index ced12dd..0023ab3 100644 --- a/Sources/CSFrom.swift +++ b/Sources/CSFrom.swift @@ -29,115 +29,46 @@ import CoreData // MARK: - CSFrom -/** - The `CSFrom` serves as the Objective-C bridging type for `From`. - - - SeeAlso: `From` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSFrom: NSObject { - - /** - The associated `NSManagedObject` entity class - */ + @objc public var entityClass: AnyClass { - - return self.bridgeToSwift.entityClass + + fatalError() } - - /** - The `NSPersistentStore` configuration names to associate objects from. - May contain `NSString` instances to pertain to named configurations, or `NSNull` to pertain to the default configuration - */ + @objc public var configurations: [Any]? { - - return self.bridgeToSwift.configurations?.map { - - switch $0 { - - case nil: return NSNull() - case let string as NSString: return string - } - } + + fatalError() } - - /** - Initializes a `CSFrom` clause with the specified entity class. - ``` - MyPersonEntity *people = [transaction fetchAllFrom:CSFromClass([MyPersonEntity class])]; - ``` - - parameter entityClass: the `NSManagedObject` class type to be created - */ + @objc public convenience init(entityClass: NSManagedObject.Type) { - - self.init(From(entityClass)) + + fatalError() } - - /** - Initializes a `CSFrom` clause with the specified configurations. - ``` - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class], @"Config1")]; - ``` - - parameter entityClass: the associated `NSManagedObject` entity class - - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `[NSNull null]` to use the default configuration. - */ + @objc public convenience init(entityClass: NSManagedObject.Type, configuration: Any) { - - switch configuration { - - case let string as String: - self.init(From(entityClass, string)) - - case is NSNull: - self.init(From(entityClass, nil)) - - default: - Internals.abort("The configuration argument only accepts NSString and NSNull values") - } + + fatalError() } - - /** - Initializes a `CSFrom` clause with the specified configurations. - ``` - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class], - @[[NSNull null], @"Config1"])]; - ``` - - parameter entityClass: the associated `NSManagedObject` entity class - - parameter configurations: an array of the `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `[NSNull null]` to use the default configuration. - */ + @objc public convenience init(entityClass: NSManagedObject.Type, configurations: [Any]) { - - var arguments = [ModelConfiguration]() - for configuration in configurations { - - switch configuration { - - case let string as String: - arguments.append(string) - - case is NSNull: - arguments.append(nil) - - default: - Internals.abort("The configurations argument only accepts NSString and NSNull values") - } - } - self.init(From(entityClass, arguments)) + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -146,33 +77,21 @@ public final class CSFrom: NSObject { public let bridgeToSwift: From public init(_ swiftValue: From) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - From +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension From where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSFrom { - - return CSFrom(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> From { - - return From( - entityClass: self.entityClass, - configurations: self.configurations, - findPersistentStores: self.findPersistentStores - ) + + fatalError() } } diff --git a/Sources/CSGroupBy.swift b/Sources/CSGroupBy.swift index 9a7cff9..c39d9c0 100644 --- a/Sources/CSGroupBy.swift +++ b/Sources/CSGroupBy.swift @@ -29,65 +29,44 @@ import CoreData // MARK: - CSGroupBy -/** - The `CSGroupBy` serves as the Objective-C bridging type for `GroupBy`. - - - SeeAlso: `GroupBy` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSGroupBy: NSObject, CSQueryClause { - /** - The list of key path strings to group results with - */ @objc public var keyPaths: [KeyPathString] { - - return self.bridgeToSwift.keyPaths + + fatalError() } - - /** - Initializes a `CSGroupBy` clause with a key path string - - - parameter keyPath: a key path string to group results with - */ + @objc public convenience init(keyPath: KeyPathString) { - - self.init(GroupBy(keyPath)) + + fatalError() } - - /** - Initializes a `CSGroupBy` clause with a list of key path strings - - - parameter keyPaths: a list of key path strings to group results with - */ + @objc public convenience init(keyPaths: [KeyPathString]) { - - self.init(GroupBy(keyPaths)) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSGroupBy else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -95,8 +74,8 @@ public final class CSGroupBy: NSObject, CSQueryClause { @objc public func applyToFetchRequest(_ fetchRequest: NSFetchRequest) { - - self.bridgeToSwift.applyToFetchRequest(fetchRequest) + + fatalError() } @@ -105,29 +84,21 @@ public final class CSGroupBy: NSObject, CSQueryClause { public let bridgeToSwift: GroupBy public init(_ swiftValue: GroupBy) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - GroupBy +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension GroupBy where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSGroupBy { - - return CSGroupBy(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> GroupBy { - - return GroupBy(self.keyPaths) + + fatalError() } } diff --git a/Sources/CSInMemoryStore.swift b/Sources/CSInMemoryStore.swift index 440c56d..7b12308 100644 --- a/Sources/CSInMemoryStore.swift +++ b/Sources/CSInMemoryStore.swift @@ -29,82 +29,56 @@ import CoreData // MARK: - CSInMemoryStore -/** - The `CSInMemoryStore` serves as the Objective-C bridging type for `InMemoryStore`. - - - SeeAlso: `InMemoryStore` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSInMemoryStore: NSObject, CSStorageInterface, CoreStoreObjectiveCType { - - /** - Initializes a `CSInMemoryStore` for the specified configuration - - - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. - */ + @objc public convenience init(configuration: ModelConfiguration) { - - self.init(InMemoryStore(configuration: configuration)) + + fatalError() } - - /** - Initializes a `CSInMemoryStore` with the "Default" configuration - */ + @objc public convenience override init() { - - self.init(InMemoryStore()) + + fatalError() } // MARK: StorageInterface - - /** - The string identifier for the `NSPersistentStore`'s `type` property. For `CSInMemoryStore`s, this is always set to `NSInMemoryStoreType`. - */ + @objc public static let storeType = NSInMemoryStoreType - - /** - The configuration name in the model file - */ + @objc public var configuration: ModelConfiguration { - - return self.bridgeToSwift.configuration + + fatalError() } - /** - The options dictionary for the `NSPersistentStore`. For `CSInMemoryStore`s, this is always set to `nil`. - */ @objc public var storeOptions: [AnyHashable: Any]? { - - return self.bridgeToSwift.storeOptions + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.bridgeToSwift).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSInMemoryStore else { - - return false - } - return self.bridgeToSwift === object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -113,22 +87,21 @@ public final class CSInMemoryStore: NSObject, CSStorageInterface, CoreStoreObjec public let bridgeToSwift: InMemoryStore public required init(_ swiftValue: InMemoryStore) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - InMemoryStore -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension InMemoryStore: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSInMemoryStore { - - return CSInMemoryStore(self) + + fatalError() } } diff --git a/Sources/CSInto.swift b/Sources/CSInto.swift index a49e602..c9b8c3e 100644 --- a/Sources/CSInto.swift +++ b/Sources/CSInto.swift @@ -29,82 +29,50 @@ import CoreData // MARK: - CSInto -/** - The `CSInto` serves as the Objective-C bridging type for `Into`. - - - SeeAlso: `Into` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSInto: NSObject { - - /** - The associated `NSManagedObject` entity class - */ + @objc public var entityClass: NSManagedObject.Type { - - return self.bridgeToSwift.entityClass + + fatalError() } - - /** - The `NSPersistentStore` configuration name to associate objects from. - May contain a `String` to pertain to a named configuration, or `nil` to pertain to the default configuration - */ + @objc public var configuration: ModelConfiguration { - - return self.bridgeToSwift.configuration + + fatalError() } - - /** - Initializes a `CSInto` clause with the specified entity class. - ``` - MyPersonEntity *person = [transaction createInto: - CSIntoClass([MyPersonEntity class])]; - ``` - - parameter entityClass: the `NSManagedObject` class type to be created - */ + @objc public convenience init(entityClass: NSManagedObject.Type) { - - self.init(Into(entityClass)) + + fatalError() } - - /** - Initializes a `CSInto` clause with the specified configuration. - ``` - MyPersonEntity *person = [transaction createInto: - CSIntoClass([MyPersonEntity class])]; - ``` - - parameter entityClass: the `NSManagedObject` class type to be created - - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration. - */ + @objc public convenience init(entityClass: NSManagedObject.Type, configuration: ModelConfiguration) { - - self.init(Into(entityClass, configuration)) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSInto else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -113,9 +81,8 @@ public final class CSInto: NSObject { public let bridgeToSwift: Into public required init(_ swiftValue: Into) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } @@ -125,21 +92,10 @@ public final class CSInto: NSObject { extension Into where O: NSManagedObject { // MARK: CoreStoreSwiftType - + + @available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") public var bridgeToObjectiveC: CSInto { - - return CSInto(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> Into { - - return Into( - entityClass: self.entityClass, - configuration: self.configuration, - inferStoreIfPossible: self.inferStoreIfPossible - ) + + fatalError() } } diff --git a/Sources/CSListMonitor.swift b/Sources/CSListMonitor.swift index f4a5d67..eef9a04 100644 --- a/Sources/CSListMonitor.swift +++ b/Sources/CSListMonitor.swift @@ -29,503 +29,201 @@ import CoreData // MARK: - CSListMonitor -/** - The `CSListMonitor` serves as the Objective-C bridging type for `ListMonitor`. - - - SeeAlso: `ListMonitor` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSListMonitor: NSObject { // MARK: Public (Accessors) - /** - Returns the object at the given index within the first section. This subscript indexer is typically used for `CSListMonitor`s created without section groupings. - - - parameter index: the index of the object. Using an index above the valid range will raise an exception. - - returns: the `NSManagedObject` at the specified index - */ @objc public subscript(index: Int) -> Any { - - return self.bridgeToSwift[index] + + fatalError() } - - /** - Returns the object at the given index, or `nil` if out of bounds. This indexer is typically used for `CSListMonitor`s created without section groupings. - - - parameter index: the index for the object. Using an index above the valid range will return `nil`. - - returns: the `NSManagedObject` at the specified index, or `nil` if out of bounds - */ + @objc public func objectAtSafeIndex(_ index: Int) -> Any? { - - return self.bridgeToSwift[safeIndex: index] + + fatalError() } - - /** - Returns the object at the given `sectionIndex` and `itemIndex`. This indexer is typically used for `CSListMonitor`s created as sectioned lists. - - - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will raise an exception. - - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will raise an exception. - - returns: the `NSManagedObject` at the specified section and item index - */ + @objc public func objectAtSectionIndex(_ sectionIndex: Int, itemIndex: Int) -> Any { - - return self.bridgeToSwift[sectionIndex, itemIndex] - } /** - Returns the object at the given section and item index, or `nil` if out of bounds. This indexer is typically used for `CSListMonitor`s created as sectioned lists. - - - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will return `nil`. - - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`. - - returns: the `NSManagedObject` at the specified section and item index, or `nil` if out of bounds - */ + + fatalError() + } + @objc public func objectAtSafeSectionIndex(_ sectionIndex: Int, safeItemIndex itemIndex: Int) -> Any? { - - return self.bridgeToSwift[safeSectionIndex: sectionIndex, safeItemIndex: itemIndex] + + fatalError() } - - /** - Returns the object at the given `NSIndexPath`. This subscript indexer is typically used for `CSListMonitor`s created as sectioned lists. - - - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will raise an exception. - - returns: the `NSManagedObject` at the specified index path - */ + @objc public func objectAtIndexPath(_ indexPath: IndexPath) -> Any { - - return self.bridgeToSwift[indexPath] + + fatalError() } - - /** - Returns the object at the given `NSIndexPath`, or `nil` if out of bounds. This subscript indexer is typically used for `CSListMonitor`s created as sectioned lists. - - - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will return `nil`. - - returns: the `NSManagedObject` at the specified index path, or `nil` if out of bounds - */ + @objc public func objectAtSafeIndexPath(_ indexPath: IndexPath) -> Any? { - - return self.bridgeToSwift[safeIndexPath: indexPath] + + fatalError() } - - /** - Checks if the `CSListMonitor` has at least one object in any section. - - - returns: `YES` if at least one object in any section exists, `NO` otherwise - */ + @objc public func hasObjects() -> Bool { - - return self.bridgeToSwift.hasObjects() + + fatalError() } - - /** - Checks if the `CSListMonitor` has at least one object the specified section. - - - parameter section: the section index. Using an index outside the valid range will return `NO`. - - returns: `YES` if at least one object in the specified section exists, `NO` otherwise - */ + @objc public func hasObjectsInSection(_ section: Int) -> Bool { - - return self.bridgeToSwift.hasObjects(in: section) + + fatalError() } - - /** - Returns all objects in all sections - - - returns: all objects in all sections - */ + @objc public func objectsInAllSections() -> [NSManagedObject] { - - return self.bridgeToSwift.objectsInAllSections() + + fatalError() } - - /** - Returns all objects in the specified section - - - parameter section: the section index. Using an index outside the valid range will raise an exception. - - returns: all objects in the specified section - */ + @objc public func objectsInSection(_ section: Int) -> [NSManagedObject] { - - return self.bridgeToSwift.objects(in: section) + + fatalError() } - - /** - Returns all objects in the specified section, or `nil` if out of bounds. - - - parameter section: the section index. Using an index outside the valid range will return `nil`. - - returns: all objects in the specified section, or `nil` if out of bounds - */ + @objc public func objectsInSafeSection(safeSectionIndex section: Int) -> [NSManagedObject]? { - - return self.bridgeToSwift.objects(safelyIn: section) + + fatalError() } - /** - Returns the number of sections - - - returns: the number of sections - */ @objc public func numberOfSections() -> Int { - - return self.bridgeToSwift.numberOfSections() - } - - /** - Returns the number of objects in all sections - - - returns: the number of objects in all sections - */ - @objc - public func numberOfObjects() -> Int { - - return self.bridgeToSwift.numberOfObjects() + + fatalError() + } + + @objc + public func numberOfObjects() -> Int { + + fatalError() } - /** - Returns the number of objects in the specified section - - - parameter section: the section index. Using an index outside the valid range will raise an exception. - - returns: the number of objects in the specified section - */ @objc public func numberOfObjectsInSection(_ section: Int) -> Int { - - return self.bridgeToSwift.numberOfObjects(in: section) + + fatalError() } - - /** - Returns the number of objects in the specified section, or `nil` if out of bounds. - - - parameter section: the section index. Using an index outside the valid range will return `nil`. - - returns: the number of objects in the specified section, or `nil` if out of bounds - */ + @objc public func numberOfObjectsInSafeSection(safeSectionIndex section: Int) -> NSNumber? { - - return self.bridgeToSwift - .numberOfObjects(safelyIn: section) - .flatMap { NSNumber(value: $0) } + + fatalError() } - - /** - Returns the `NSFetchedResultsSectionInfo` for the specified section - - - parameter section: the section index. Using an index outside the valid range will raise an exception. - - returns: the `NSFetchedResultsSectionInfo` for the specified section - */ + @objc public func sectionInfoAtIndex(_ section: Int) -> NSFetchedResultsSectionInfo { - - return self.bridgeToSwift.sectionInfo(at: section) + + fatalError() } - - /** - Returns the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if out of bounds. - - - parameter section: the section index. Using an index outside the valid range will return `nil`. - - returns: the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if the section index is out of bounds. - */ + @objc public func sectionInfoAtSafeSectionIndex(safeSectionIndex section: Int) -> NSFetchedResultsSectionInfo? { - - return self.bridgeToSwift.sectionInfo(safelyAt: section) + + fatalError() } - - /** - Returns the `NSFetchedResultsSectionInfo`s for all sections - - - returns: the `NSFetchedResultsSectionInfo`s for all sections - */ + @objc public func sections() -> [NSFetchedResultsSectionInfo] { - - return self.bridgeToSwift.sections() + + fatalError() } - - /** - Returns the target section for a specified "Section Index" title and index. - - - parameter title: the title of the Section Index - - parameter index: the index of the Section Index - - returns: the target section for the specified "Section Index" title and index. - */ + @objc public func targetSectionForSectionIndexTitle(title: String, index: Int) -> Int { - - return self.bridgeToSwift.targetSection(forSectionIndexTitle: title, at: index) + + fatalError() } - - /** - Returns the section index titles for all sections - - - returns: the section index titles for all sections - */ + @objc public func sectionIndexTitles() -> [String] { - - return self.bridgeToSwift.sectionIndexTitles() + + fatalError() } - - /** - Returns the index of the `NSManagedObject` if it exists in the `CSListMonitor`'s fetched objects, or `nil` if not found. - - - parameter object: the `NSManagedObject` to search the index of - - returns: the index of the `NSManagedObject` if it exists in the `CSListMonitor`'s fetched objects, or `nil` if not found. - */ + @objc public func indexOf(_ object: NSManagedObject) -> NSNumber? { - - return self.bridgeToSwift - .index(of: object) - .flatMap { NSNumber(value: $0) } + + fatalError() } - - /** - Returns the `NSIndexPath` of the `NSManagedObject` if it exists in the `CSListMonitor`'s fetched objects, or `nil` if not found. - - - parameter object: the `NSManagedObject` to search the index of - - returns: the `NSIndexPath` of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found. - */ + @objc public func indexPathOf(_ object: NSManagedObject) -> IndexPath? { - - return self.bridgeToSwift.indexPath(of: object) + + fatalError() } // MARK: Public (Observers) - - /** - Registers a `CSListObserver` to be notified when changes to the receiver's list occur. - - To prevent retain-cycles, `CSListMonitor` only keeps `weak` references to its observers. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - Calling `-addListObserver:` multiple times on the same observer is safe, as `CSListMonitor` unregisters previous notifications to the observer before re-registering them. - - - parameter observer: a `CSListObserver` to send change notifications to - */ + @objc public func addListObserver(_ observer: CSListObserver) { - - let swift = self.bridgeToSwift - swift.unregisterObserver(observer) - swift.registerObserver( - observer, - willChange: { (observer, monitor) in - - observer.listMonitorWillChange?(monitor.bridgeToObjectiveC) - }, - didChange: { (observer, monitor) in - - observer.listMonitorDidChange?(monitor.bridgeToObjectiveC) - }, - willRefetch: { (observer, monitor) in - - observer.listMonitorWillRefetch?(monitor.bridgeToObjectiveC) - }, - didRefetch: { (observer, monitor) in - - observer.listMonitorDidRefetch?(monitor.bridgeToObjectiveC) - } - ) + + fatalError() } - - /** - Registers a `CSListObjectObserver` to be notified when changes to the receiver's list occur. - - To prevent retain-cycles, `CSListMonitor` only keeps `weak` references to its observers. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - Calling `-addListObjectObserver:` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them. - - - parameter observer: a `CSListObjectObserver` to send change notifications to - */ + public func addListObjectObserver(_ observer: CSListObjectObserver) { - - let swift = self.bridgeToSwift - swift.unregisterObserver(observer) - swift.registerObserver( - observer, - willChange: { (observer, monitor) in - - observer.listMonitorWillChange?(monitor.bridgeToObjectiveC) - }, - didChange: { (observer, monitor) in - - observer.listMonitorDidChange?(monitor.bridgeToObjectiveC) - }, - willRefetch: { (observer, monitor) in - - observer.listMonitorWillRefetch?(monitor.bridgeToObjectiveC) - }, - didRefetch: { (observer, monitor) in - - observer.listMonitorDidRefetch?(monitor.bridgeToObjectiveC) - } - ) - swift.registerObserver( - observer, - didInsertObject: { (observer, monitor, object, toIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didInsertObject: object, toIndexPath: toIndexPath) - }, - didDeleteObject: { (observer, monitor, object, fromIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didDeleteObject: object, fromIndexPath: fromIndexPath) - }, - didUpdateObject: { (observer, monitor, object, atIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didUpdateObject: object, atIndexPath: atIndexPath) - }, - didMoveObject: { (observer, monitor, object, fromIndexPath, toIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didMoveObject: object, fromIndexPath: fromIndexPath, toIndexPath: toIndexPath) - } - ) + + fatalError() } - - /** - Registers a `CSListSectionObserver` to be notified when changes to the receiver's list occur. - - To prevent retain-cycles, `CSListMonitor` only keeps `weak` references to its observers. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - Calling `-addListSectionObserver:` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them. - - - parameter observer: a `CSListSectionObserver` to send change notifications to - */ + @objc public func addListSectionObserver(_ observer: CSListSectionObserver) { - - let swift = self.bridgeToSwift - swift.unregisterObserver(observer) - swift.registerObserver( - observer, - willChange: { (observer, monitor) in - - observer.listMonitorWillChange?(monitor.bridgeToObjectiveC) - }, - didChange: { (observer, monitor) in - - observer.listMonitorDidChange?(monitor.bridgeToObjectiveC) - }, - willRefetch: { (observer, monitor) in - - observer.listMonitorWillRefetch?(monitor.bridgeToObjectiveC) - }, - didRefetch: { (observer, monitor) in - - observer.listMonitorDidRefetch?(monitor.bridgeToObjectiveC) - } - ) - swift.registerObserver( - observer, - didInsertObject: { (observer, monitor, object, toIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didInsertObject: object, toIndexPath: toIndexPath) - }, - didDeleteObject: { (observer, monitor, object, fromIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didDeleteObject: object, fromIndexPath: fromIndexPath) - }, - didUpdateObject: { (observer, monitor, object, atIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didUpdateObject: object, atIndexPath: atIndexPath) - }, - didMoveObject: { (observer, monitor, object, fromIndexPath, toIndexPath) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didMoveObject: object, fromIndexPath: fromIndexPath, toIndexPath: toIndexPath) - } - ) - swift.registerObserver( - observer, - didInsertSection: { (observer, monitor, sectionInfo, toIndex) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didInsertSection: sectionInfo, toSectionIndex: toIndex) - }, - didDeleteSection: { (observer, monitor, sectionInfo, fromIndex) in - - observer.listMonitor?(monitor.bridgeToObjectiveC, didDeleteSection: sectionInfo, fromSectionIndex: fromIndex) - } - ) + + fatalError() } - - /** - Unregisters a `CSListObserver` from receiving notifications for changes to the receiver's list. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - - parameter observer: a `CSListObserver` to unregister notifications to - */ + @objc public func removeListObserver(_ observer: CSListObserver) { - - self.bridgeToSwift.unregisterObserver(observer) + + fatalError() } // MARK: Public (Refetching) - - /** - Returns `YES` if a call to `-refetch:` was made to the `CSListMonitor` and is currently waiting for the fetching to complete. Returns `NO` otherwise. - */ + @objc public var isPendingRefetch: Bool { - - return self.bridgeToSwift.isPendingRefetch + + fatalError() } - - /** - Asks the `CSListMonitor` to refetch its objects using the specified series of `CSFetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes. - - `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes. - - - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. - - Important: Starting CoreStore 4.0, all `CSFetchClause`s required by the `CSListMonitor` should be provided in the arguments list of `refetch(...)`. - */ + @objc public func refetch(_ fetchClauses: [CSFetchClause]) { - - self.bridgeToSwift.refetch { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSListMonitor else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -536,33 +234,21 @@ public final class CSListMonitor: NSObject { @nonobjc public required init(_ swiftValue: ListMonitor) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - ListMonitor +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension ListMonitor where ListMonitor.ObjectType: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSListMonitor { - - return CSListMonitor(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> ListMonitor { - - func noWarnUnsafeBitCast(_ x: T, to type: U.Type) -> U { - - return unsafeBitCast(x, to: type) - } - return noWarnUnsafeBitCast(self, to: ListMonitor.self) + + fatalError() } } diff --git a/Sources/CSListObserver.swift b/Sources/CSListObserver.swift index 8c48e7f..2f1723a 100644 --- a/Sources/CSListObserver.swift +++ b/Sources/CSListObserver.swift @@ -29,49 +29,19 @@ import CoreData // MARK: - CSListObserver -/** - Implement the `CSListObserver` protocol to observe changes to a list of `NSManagedObject`s. `CSListObserver`s may register themselves to a `CSListMonitor`'s `-addListObserver:` method: - ``` - CSListMonitor *monitor = [CSCoreStore - monitorListFrom:[CSFrom entityClass:[MyPersonEntity class]] - fetchClauses:@[[CSOrderBy sortDescriptor:[CSSortKey withKeyPath:@"lastName" ascending:YES]]]]; - [monitor addListObserver:self]; - ``` - - - SeeAlso: `ListObserver` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSListObserver: AnyObject { - - /** - Handles processing just before a change to the observed list occurs - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - */ + @objc optional func listMonitorWillChange(_ monitor: CSListMonitor) - - /** - Handles processing right after a change to the observed list occurs - - - parameter monitor: the `CSListMonitor` monitoring the object being observed - */ + @objc optional func listMonitorDidChange(_ monitor: CSListMonitor) - - /** - This method is broadcast from within the `CSListMonitor`'s `-refetchWithFetchClauses:` method to let observers prepare for the internal `NSFetchedResultsController`'s pending change to its predicate, sort descriptors, etc. Note that the actual refetch will happen after the `NSFetchedResultsController`'s last `-controllerDidChangeContent:` notification completes. - - - parameter monitor: the `CSListMonitor` monitoring the object being observed - */ + @objc optional func listMonitorWillRefetch(_ monitor: CSListMonitor) - - /** - After the `CSListMonitor`'s `-refetchWithFetchClauses:` method is called, this method is broadcast after the `NSFetchedResultsController`'s last `-controllerDidChangeContent:` notification completes. - - - parameter monitor: the `CSListMonitor` monitoring the object being observed - */ + @objc optional func listMonitorDidRefetch(_ monitor: CSListMonitor) } @@ -79,58 +49,19 @@ public protocol CSListObserver: AnyObject { // MARK: - ListObjectObserver -/** - Implement the `CSListObjectObserver` protocol to observe detailed changes to a list's object. `CSListObjectObserver`s may register themselves to a `CSListMonitor`'s `-addListObjectObserver(_:)` method: - ``` - CSListMonitor *monitor = [CSCoreStore - monitorListFrom:[CSFrom entityClass:[MyPersonEntity class]] - fetchClauses:@[[CSOrderBy sortDescriptor:[CSSortKey withKeyPath:@"lastName" ascending:YES]]]]; - [monitor addListObjectObserver:self]; - ``` - - - SeeAlso: `ListObjectObserver` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSListObjectObserver: CSListObserver { - - /** - Notifies that an object was inserted to the specified `NSIndexPath` in the list - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter object: the entity type for the inserted object - - parameter indexPath: the new `NSIndexPath` for the inserted object - */ + @objc optional func listMonitor(_ monitor: CSListMonitor, didInsertObject object: Any, toIndexPath indexPath: IndexPath) - - /** - Notifies that an object was deleted from the specified `NSIndexPath` in the list - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter object: the entity type for the deleted object - - parameter indexPath: the `NSIndexPath` for the deleted object - */ + @objc optional func listMonitor(_ monitor: CSListMonitor, didDeleteObject object: Any, fromIndexPath indexPath: IndexPath) - - /** - Notifies that an object at the specified `NSIndexPath` was updated - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter object: the entity type for the updated object - - parameter indexPath: the `NSIndexPath` for the updated object - */ + @objc optional func listMonitor(_ monitor: CSListMonitor, didUpdateObject object: Any, atIndexPath indexPath: IndexPath) - - /** - Notifies that an object's index changed - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter object: the entity type for the moved object - - parameter fromIndexPath: the previous `NSIndexPath` for the moved object - - parameter toIndexPath: the new `NSIndexPath` for the moved object - */ + @objc optional func listMonitor(_ monitor: CSListMonitor, didMoveObject object: Any, fromIndexPath: IndexPath, toIndexPath: IndexPath) } @@ -138,38 +69,13 @@ public protocol CSListObjectObserver: CSListObserver { // MARK: - CSListSectionObserver -/** - Implement the `CSListSectionObserver` protocol to observe changes to a list's section info. `CSListSectionObserver`s may register themselves to a `CSListMonitor`'s `-addListSectionObserver:` method: - ``` - CSListMonitor *monitor = [CSCoreStore - monitorSectionedListFrom:[CSFrom entityClass:[MyPersonEntity class]] - sectionBy:[CSSectionBy keyPath:@"age"] - fetchClauses:@[[CSOrderBy sortDescriptor:[CSSortKey withKeyPath:@"lastName" ascending:YES]]]]; - [monitor addListSectionObserver:self]; - ``` - - - SeeAlso: `ListSectionObserver` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSListSectionObserver: CSListObjectObserver { - - /** - Notifies that a section was inserted at the specified index - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section - - parameter sectionIndex: the new section index for the new section - */ + @objc optional func listMonitor(_ monitor: CSListMonitor, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) - /** - Notifies that a section was inserted at the specified index - - - parameter monitor: the `CSListMonitor` monitoring the list being observed - - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section - - parameter sectionIndex: the previous section index for the deleted section - */ @objc optional func listMonitor(_ monitor: CSListMonitor, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) } diff --git a/Sources/CSMigrationResult.swift b/Sources/CSMigrationResult.swift index 54cea1e..2d1ac06 100644 --- a/Sources/CSMigrationResult.swift +++ b/Sources/CSMigrationResult.swift @@ -29,134 +29,68 @@ import CoreData // MARK: - CSMigrationResult -/** - The `CSMigrationResult` serves as the Objective-C bridging type for `MigrationResult`. - - - SeeAlso: `MigrationResult` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSMigrationResult: NSObject, CoreStoreObjectiveCType { - - /** - `YES` if the migration succeeded, `NO` otherwise - */ + @objc public var isSuccess: Bool { - - return (try? self.bridgeToSwift.get()) != nil + + fatalError() } - - /** - `YES` if the migration failed, `NO` otherwise - */ + @objc public var isFailure: Bool { return !self.isSuccess } - - /** - `YES` if the migration succeeded, `NO` otherwise - */ + @objc public var migrationTypes: [CSMigrationType]? { - - guard case .success(let migrationTypes) = self.bridgeToSwift else { - - return nil - } - return migrationTypes.map { $0.bridgeToObjectiveC } + + fatalError() } - - /** - The `NSError` for a failed migration, or `nil` if the migration succeeded - */ + @objc public var error: NSError? { - - guard case .failure(let error) = self.bridgeToSwift else { - - return nil - } - return error.bridgeToObjectiveC + + fatalError() } - - /** - If the result was a success, the `success` block is executed with an array of `CSMigrationType`s that indicates the migration steps completed. If the result was a failure, the `failure` block is executed with an `NSError` argument pertaining to the actual error. - - The blocks are executed immediately as `@noescape` and will not be retained. - - - parameter success: the block to execute on success. The block passes an array of `CSMigrationType`s that indicates the migration steps completed. - - parameter failure: the block to execute on failure. The block passes an `NSError` argument that pertains to the actual error. - */ + @objc public func handleSuccess(_ success: (_ migrationTypes: [CSMigrationType]) -> Void, failure: (_ error: NSError) -> Void) { - - switch self.bridgeToSwift { - - case .success(let migrationTypes): - success(migrationTypes.map { $0.bridgeToObjectiveC }) - - case .failure(let error): - failure(error.bridgeToObjectiveC) - } + + fatalError() } - - /** - If the result was a success, the `success` block is executed with an array of `CSMigrationType`s that indicates the migration steps completed. If the result was a failure, this method does nothing. - - The block is executed immediately as `@noescape` and will not be retained. - - - parameter success: the block to execute on success. The block passes an array of `CSMigrationType`s that indicates the migration steps completed. - */ + @objc public func handleSuccess(_ success: (_ migrationTypes: [CSMigrationType]) -> Void) { - - guard case .success(let migrationTypes) = self.bridgeToSwift else { - - return - } - success(migrationTypes.map { $0.bridgeToObjectiveC }) + + fatalError() } - - /** - If the result was a failure, the `failure` block is executed with an `NSError` argument pertaining to the actual error. If the result was a success, this method does nothing. - - The block is executed immediately as `@noescape` and will not be retained. - - - parameter failure: the block to execute on failure. The block passes an `NSError` argument that pertains to the actual error. - */ + @objc public func handleFailure(_ failure: (_ error: NSError) -> Void) { - - guard case .failure(let error) = self.bridgeToSwift else { - - return - } - failure(error.bridgeToObjectiveC) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSMigrationResult else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -165,22 +99,21 @@ public final class CSMigrationResult: NSObject, CoreStoreObjectiveCType { public let bridgeToSwift: MigrationResult public required init(_ swiftValue: MigrationResult) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - MigrationResult -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension MigrationResult { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSMigrationResult { - - return CSMigrationResult(self) + + fatalError() } } diff --git a/Sources/CSMigrationType.swift b/Sources/CSMigrationType.swift index 9669c32..129321a 100644 --- a/Sources/CSMigrationType.swift +++ b/Sources/CSMigrationType.swift @@ -29,80 +29,56 @@ import CoreData // MARK: - CSMigrationType -/** - The `CSMigrationType` serves as the Objective-C bridging type for `MigrationType`. - - - SeeAlso: `MigrationType` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSMigrationType: NSObject, CoreStoreObjectiveCType { - - /** - Returns `YES` if the `CSMigrationType`'s `sourceVersion` and `destinationVersion` do not match. Returns `NO` otherwise. - */ + @objc public var needsMigration: Bool { - - return self.bridgeToSwift.hasMigration + + fatalError() } - - /** - Returns the source model version for the migration type. If no migration is required, `sourceVersion` will be equal to the `destinationVersion`. - */ + @objc public var sourceVersion: String { - - return self.bridgeToSwift.sourceVersion + + fatalError() } - - /** - Returns the destination model version for the migration type. If no migration is required, `destinationVersion` will be equal to the `sourceVersion`. - */ + @objc public var destinationVersion: String { - - return self.bridgeToSwift.destinationVersion + + fatalError() } - - /** - Returns `YES` if the `CSMigrationType` is a lightweight migration. Used as syntactic sugar. - */ + @objc public var isLightweightMigration: Bool { - - return self.bridgeToSwift.isLightweightMigration + + fatalError() } - - /** - Returns `YES` if the `CSMigrationType` is a heavyweight migration. Used as syntactic sugar. - */ + @objc public var isHeavyweightMigration: Bool { - - return self.bridgeToSwift.isHeavyweightMigration + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSMigrationType else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -111,22 +87,21 @@ public final class CSMigrationType: NSObject, CoreStoreObjectiveCType { public let bridgeToSwift: MigrationType public required init(_ swiftValue: MigrationType) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - MigrationType -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension MigrationType: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSMigrationType { - - return CSMigrationType(self) + + fatalError() } } diff --git a/Sources/CSObjectMonitor.swift b/Sources/CSObjectMonitor.swift index 41f78c5..e2d466d 100644 --- a/Sources/CSObjectMonitor.swift +++ b/Sources/CSObjectMonitor.swift @@ -29,72 +29,28 @@ import CoreData // MARK: - CSObjectMonitor -/** - The `CSObjectMonitor` serves as the Objective-C bridging type for `ObjectMonitor`. - - - SeeAlso: `ObjectMonitor` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSObjectMonitor: NSObject { - /** - Returns the `NSManagedObject` instance being observed, or `nil` if the object was already deleted. - */ public var object: Any? { - - return self.bridgeToSwift.object + + fatalError() } - - /** - Returns `YES` if the `NSManagedObject` instance being observed still exists, or `NO` if the object was already deleted. - */ + public var isObjectDeleted: Bool { - - return self.bridgeToSwift.isObjectDeleted + + fatalError() } - - /** - Registers a `CSObjectObserver` to be notified when changes to the receiver's `object` are made. - - To prevent retain-cycles, `CSObjectMonitor` only keeps `weak` references to its observers. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - Calling `-addObjectObserver:` multiple times on the same observer is safe, as `CSObjectMonitor` unregisters previous notifications to the observer before re-registering them. - - - parameter observer: an `CSObjectObserver` to send change notifications to - */ + public func addObjectObserver(_ observer: CSObjectObserver) { - - let swift = self.bridgeToSwift - swift.unregisterObserver(observer) - swift.registerObserver( - observer, - willChangeObject: { (observer, monitor, object) in - - observer.objectMonitor?(monitor.bridgeToObjectiveC, willUpdateObject: object) - }, - didDeleteObject: { (observer, monitor, object) in - - observer.objectMonitor?(monitor.bridgeToObjectiveC, didDeleteObject: object) - }, - didUpdateObject: { (observer, monitor, object, changedPersistentKeys) in - - observer.objectMonitor?(monitor.bridgeToObjectiveC, didUpdateObject: object, changedPersistentKeys: changedPersistentKeys) - } - ) + + fatalError() } - - /** - Unregisters an `CSObjectObserver` from receiving notifications for changes to the receiver's `object`. - - For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. - - - parameter observer: an `CSObjectObserver` to unregister notifications to - */ + public func removeObjectObserver(_ observer: CSObjectObserver) { - - self.bridgeToSwift.unregisterObserver(observer) + + fatalError() } @@ -102,23 +58,17 @@ public final class CSObjectMonitor: NSObject { public override var hash: Int { - var hasher = Hasher() - self.bridgeToSwift.hash(into: &hasher) - return hasher.finalize() + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSObjectMonitor else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -129,33 +79,21 @@ public final class CSObjectMonitor: NSObject { @nonobjc public required init(_ swiftValue: ObjectMonitor) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - ObjectMonitor +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension ObjectMonitor where ObjectMonitor.ObjectType: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSObjectMonitor { - - return CSObjectMonitor(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> ObjectMonitor { - - func noWarnUnsafeBitCast(_ x: T, to type: U.Type) -> U { - - return unsafeBitCast(x, to: type) - } - return noWarnUnsafeBitCast(self, to: ObjectMonitor.self) + + fatalError() } } diff --git a/Sources/CSObjectObserver.swift b/Sources/CSObjectObserver.swift index 3490882..5ad1006 100644 --- a/Sources/CSObjectObserver.swift +++ b/Sources/CSObjectObserver.swift @@ -29,43 +29,16 @@ import CoreData // MARK: - CSObjectObserver -/** - Implement the `CSObjectObserver` protocol to observe changes to a single `NSManagedObject` instance. `CSObjectObserver`s may register themselves to a `CSObjectMonitor`'s `-addObjectObserver:` method: - ``` - CSObjectMonitor *monitor = [CSCoreStore monitorObject:myObject]; - [monitor addObjectObserver:self]; - ``` - - - SeeAlso: `ObjectObserver` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSObjectObserver: AnyObject { - /** - Handles processing just before a change to the observed `object` occurs - - - parameter monitor: the `CSObjectMonitor` monitoring the object being observed - - parameter object: the `NSManagedObject` instance being observed - */ @objc optional func objectMonitor(_ monitor: CSObjectMonitor, willUpdateObject object: Any) - - /** - Handles processing right after a change to the observed `object` occurs - - - parameter monitor: the `CSObjectMonitor` monitoring the object being observed - - parameter object: the `NSManagedObject` instance being observed - - parameter changedPersistentKeys: an `NSSet` of key paths for the attributes that were changed. Note that `changedPersistentKeys` only contains keys for attributes/relationships present in the persistent store, thus transient properties will not be reported. - */ + @objc optional func objectMonitor(_ monitor: CSObjectMonitor, didUpdateObject object: Any, changedPersistentKeys: Set) - - /** - Handles processing right after `object` is deleted - - - parameter monitor: the `CSObjectMonitor` monitoring the object being observed - - parameter object: the `NSManagedObject` instance being observed - */ + @objc optional func objectMonitor(_ monitor: CSObjectMonitor, didDeleteObject object: Any) } diff --git a/Sources/CSOrderBy.swift b/Sources/CSOrderBy.swift index 7355596..ee74ce0 100644 --- a/Sources/CSOrderBy.swift +++ b/Sources/CSOrderBy.swift @@ -29,73 +29,44 @@ import CoreData // MARK: - CSOrderBy -/** - The `CSOrderBy` serves as the Objective-C bridging type for `OrderBy`. - - - SeeAlso: `OrderBy` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteClause { - /** - The list of sort descriptors - */ @objc public var sortDescriptors: [NSSortDescriptor] { - - return self.bridgeToSwift.sortDescriptors + + fatalError() } - - /** - Initializes a `CSOrderBy` clause with a single sort descriptor - ``` - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKey(CSSortAscending(@"fullname"))]]]; - ``` - - parameter sortDescriptor: a `NSSortDescriptor` - */ + @objc public convenience init(sortDescriptor: NSSortDescriptor) { - - self.init(OrderBy(sortDescriptor)) + + fatalError() } - - /** - Initializes a `CSOrderBy` clause with a list of sort descriptors - ``` - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKeys(CSSortAscending(@"fullname"), CSSortDescending(@"age"), nil))]]]; - ``` - - parameter sortDescriptors: an array of `NSSortDescriptor`s - */ + @objc public convenience init(sortDescriptors: [NSSortDescriptor]) { - - self.init(OrderBy(sortDescriptors)) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSOrderBy else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -103,8 +74,8 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl @objc public func applyToFetchRequest(_ fetchRequest: NSFetchRequest) { - - self.bridgeToSwift.applyToFetchRequest(fetchRequest) + + fatalError() } @@ -113,29 +84,21 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl public let bridgeToSwift: OrderBy public init(_ swiftValue: OrderBy) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - OrderBy +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension OrderBy where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSOrderBy { - - return CSOrderBy(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> OrderBy { - - return OrderBy(self.sortDescriptors) + + fatalError() } } diff --git a/Sources/CSSQliteStore.swift b/Sources/CSSQliteStore.swift index b786bf3..b6fdf5a 100644 --- a/Sources/CSSQliteStore.swift +++ b/Sources/CSSQliteStore.swift @@ -29,157 +29,88 @@ import CoreData // MARK: - CSSQLiteStore -/** - The `CSSQLiteStore` serves as the Objective-C bridging type for `SQLiteStore`. - - - SeeAlso: `SQLiteStore` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSQLiteStore: NSObject, CSLocalStorage, CoreStoreObjectiveCType { - - /** - Initializes an SQLite store interface from the given SQLite file URL. When this instance is passed to the `CSDataStack`'s `-addStorage*:` methods, a new SQLite file will be created if it does not exist. - - - Important: Initializing `CSSQLiteStore`s with custom migration mapping models is currently not supported. Create an `SQLiteStore` instance from Swift code and bridge the instance to Objective-C using its `SQLiteStore.bridgeToObjectiveC` property. - - parameter fileURL: the local file URL for the target SQLite persistent store. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them. - - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them. - - parameter localStorageOptions: When the `CSSQLiteStore` is passed to the `CSDataStack`'s `addStorage()` methods, tells the `CSDataStack` how to setup the persistent store. Defaults to `CSLocalStorageOptionsNone`. - */ + @objc public convenience init(fileURL: URL, configuration: ModelConfiguration, localStorageOptions: Int) { - - self.init( - SQLiteStore( - fileURL: fileURL, - configuration: configuration, - localStorageOptions: LocalStorageOptions(rawValue: localStorageOptions) - ) - ) + + fatalError() } - - /** - Initializes an SQLite store interface from the given SQLite file name. When this instance is passed to the `CSDataStack`'s `-addStorage*:` methods, a new SQLite file will be created if it does not exist. - - - Important: Initializing `CSSQLiteStore`s with custom migration mapping models is currently not supported. Create an `SQLiteStore` instance from Swift code and bridge the instance to Objective-C using its `SQLiteStore.bridgeToObjectiveC` property. - - parameter fileName: the local filename for the SQLite persistent store in the "Application Support/" directory (or the "Caches/" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them. - - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them. - - parameter localStorageOptions: When the `CSSQLiteStore` is passed to the `CSDataStack`'s `addStorage()` methods, tells the `CSDataStack` how to setup the persistent store. Defaults to `[CSLocalStorageOptions none]`. - */ + @objc public convenience init(fileName: String, configuration: ModelConfiguration, localStorageOptions: Int) { - - self.init( - SQLiteStore( - fileName: fileName, - configuration: configuration, - localStorageOptions: LocalStorageOptions(rawValue: localStorageOptions) - ) - ) + + fatalError() } - - /** - Initializes an `CSSQLiteStore` with an all-default settings: a `fileURL` pointing to a ".sqlite" file in the "Application Support/" directory (or the "Caches/" directory on tvOS), a `nil` `configuration` pertaining to the "Default" configuration, and `localStorageOptions` set to `[CSLocalStorageOptions none]`. - - - Important: Initializing `CSSQLiteStore`s with custom migration mapping models is currently not supported. Create an `SQLiteStore` instance from Swift code and bridge the instance to Objective-C using its `SQLiteStore.bridgeToObjectiveC` property. - */ + @objc public convenience override init() { - - self.init(SQLiteStore()) + + fatalError() } // MAKR: CSLocalStorage - - /** - The `NSURL` that points to the SQLite file - */ + @objc public var fileURL: URL { - - return self.bridgeToSwift.fileURL as URL + + fatalError() } - - /** - An array of `SchemaMappingProvider`s that provides the complete mapping models for custom migrations. This is currently only supported for Swift code. - */ + @objc public var migrationMappingProviders: [Any] { - - return self.bridgeToSwift.migrationMappingProviders + + fatalError() } - - /** - Options that tell the `CSDataStack` how to setup the persistent store - */ + @objc public var localStorageOptions: Int { - - return self.bridgeToSwift.localStorageOptions.rawValue + + fatalError() } // MARK: CSStorageInterface - - /** - The string identifier for the `NSPersistentStore`'s `type` property. For `CSSQLiteStore`s, this is always set to `NSSQLiteStoreType`. - */ + @objc public static let storeType = NSSQLiteStoreType - - /** - The configuration name in the model file - */ + public var configuration: ModelConfiguration { - - return self.bridgeToSwift.configuration + + fatalError() } - - /** - The options dictionary for the `NSPersistentStore`. For `CSSQLiteStore`s, this is always set to - ``` - [NSSQLitePragmasOption: ["journal_mode": "WAL"]] - ``` - */ + @objc public var storeOptions: [AnyHashable: Any]? { - - return self.bridgeToSwift.storeOptions + + fatalError() } - - /** - Called by the `CSDataStack` to perform actual deletion of the store file from disk. Do not call directly! The `sourceModel` argument is a hint for the existing store's model version. For `CSSQLiteStore`, this converts the database's WAL journaling mode to DELETE before deleting the file. - */ + @objc public func cs_eraseStorageAndWait(metadata: NSDictionary, soureModelHint: NSManagedObjectModel?, error: NSErrorPointer) -> Bool { - - return bridge(error) { - - try self.bridgeToSwift.cs_eraseStorageAndWait(metadata: metadata as! [String: Any], soureModelHint: soureModelHint) - } + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.bridgeToSwift).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSSQLiteStore else { - - return false - } - return self.bridgeToSwift === object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -188,22 +119,21 @@ public final class CSSQLiteStore: NSObject, CSLocalStorage, CoreStoreObjectiveCT public let bridgeToSwift: SQLiteStore public required init(_ swiftValue: SQLiteStore) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - SQLiteStore -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension SQLiteStore: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSQLiteStore { - - return CSSQLiteStore(self) + + fatalError() } } diff --git a/Sources/CSSectionBy.swift b/Sources/CSSectionBy.swift index b7363c6..4777132 100644 --- a/Sources/CSSectionBy.swift +++ b/Sources/CSSectionBy.swift @@ -29,50 +29,28 @@ import CoreData // MARK: - CSSectionBy -/** - The `CSSectionBy` serves as the Objective-C bridging type for `SectionBy`. - - - SeeAlso: `SectionBy` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSectionBy: NSObject { - - /** - Initializes a `CSSectionBy` clause with the key path to use to group `CSListMonitor` objects into sections - - - parameter sectionKeyPath: the key path to use to group the objects into sections - - returns: a `CSSectionBy` clause with the key path to use to group `CSListMonitor` objects into sections - */ + @objc public static func keyPath(_ sectionKeyPath: KeyPathString) -> CSSectionBy { - - return self.init(SectionBy(sectionKeyPath)) + + fatalError() } - - /** - Initializes a `CSSectionBy` clause with the key path to use to group `CSListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title - - - parameter sectionKeyPath: the key path to use to group the objects into sections - - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title - - returns: a `CSSectionBy` clause with the key path to use to group `CSListMonitor` objects into sections - */ + @objc public static func keyPath(_ sectionKeyPath: KeyPathString, sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> CSSectionBy { - - return self.init( - SectionBy( - sectionKeyPath, - sectionIndexTransformer: sectionIndexTransformer - ) - ) + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -81,32 +59,21 @@ public final class CSSectionBy: NSObject { public let bridgeToSwift: SectionBy public init(_ swiftValue: SectionBy) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - SectionBy +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension SectionBy { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSectionBy { - - return CSSectionBy(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> SectionBy { - - return SectionBy( - self.sectionKeyPath, - sectionIndexTransformer: self.sectionIndexTransformer - ) + + fatalError() } } diff --git a/Sources/CSSelect.swift b/Sources/CSSelect.swift index d41371f..4de397d 100644 --- a/Sources/CSSelect.swift +++ b/Sources/CSSelect.swift @@ -29,147 +29,63 @@ import CoreData // MARK: - CSSelectTerm -/** - The `CSSelectTerm` serves as the Objective-C bridging type for `SelectTerm`. - - - SeeAlso: `SelectTerm` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSelectTerm: NSObject { - - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying an entity attribute. - ``` - NSString *fullName = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:CSSelectString(CSAttribute(@"fullname")) - fetchClauses:@[[CSWhere keyPath:@"employeeID" isEqualTo: @1111]]]; - ``` - - parameter keyPath: the attribute name - */ + @objc public convenience init(keyPath: KeyPathString) { - self.init(.attribute(keyPath)) + fatalError() } - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying the average value of an attribute. - ``` - NSNumber *averageAge = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect numberForTerm:[CSSelectTerm average:@"age" as:nil]]]; - ``` - - parameter keyPath: the attribute name - - parameter `as`: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average()" is used - - returns: a `CSSelectTerm` to a `CSSelect` clause for querying the average value of an attribute - */ @objc public static func average(_ keyPath: KeyPathString, as alias: KeyPathString?) -> CSSelectTerm { - - return self.init(.average(keyPath, as: alias)) + + fatalError() } - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for a count query. - ``` - NSNumber *numberOfEmployees = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect numberForTerm:[CSSelectTerm count:@"employeeID" as:nil]]]; - ``` - - parameter keyPath: the attribute name - - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count()" is used - - returns: a `SelectTerm` to a `Select` clause for a count query - */ @objc public static func count(_ keyPath: KeyPathString, as alias: KeyPathString?) -> CSSelectTerm { - - return self.init(.count(keyPath, as: alias)) + + fatalError() } - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying the maximum value for an attribute. - ``` - NSNumber *maximumAge = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect numberForTerm:[CSSelectTerm maximum:@"age" as:nil]]]; - ``` - - parameter keyPath: the attribute name - - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max()" is used - - returns: a `CSSelectTerm` to a `CSSelect` clause for querying the maximum value for an attribute - */ @objc public static func maximum(_ keyPath: KeyPathString, as alias: KeyPathString?) -> CSSelectTerm { - - return self.init(.maximum(keyPath, as: alias)) + + fatalError() } - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying the minimum value for an attribute. - ``` - NSNumber *minimumAge = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect numberForTerm:[CSSelectTerm minimum:@"age" as:nil]]]; - ``` - - parameter keyPath: the attribute name - - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min()" is used - - returns: a `CSSelectTerm` to a `CSSelect` clause for querying the minimum value for an attribute - */ @objc public static func minimum(_ keyPath: KeyPathString, as alias: KeyPathString?) -> CSSelectTerm { - - return self.init(.minimum(keyPath, as: alias)) + + fatalError() } - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying the sum value for an attribute. - ``` - NSNumber *totalAge = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect numberForTerm:[CSSelectTerm sum:@"age" as:nil]]]; - ``` - - parameter keyPath: the attribute name - - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum()" is used - - returns: a `CSSelectTerm` to a `CSSelect` clause for querying the sum value for an attribute - */ @objc public static func sum(_ keyPath: KeyPathString, as alias: KeyPathString?) -> CSSelectTerm { - - return self.init(.sum(keyPath, as: alias)) + + fatalError() } - - /** - Provides a `CSSelectTerm` to a `CSSelect` clause for querying the `NSManagedObjectID`. - ``` - NSManagedObjectID *objectID = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect objectIDForTerm:[CSSelectTerm objectIDAs:nil]] - fetchClauses:@[[CSWhere keyPath:@"employeeID" isEqualTo: @1111]]]; - ``` - - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "objecID" is used - - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute - */ + @objc public static func objectIDAs(_ alias: KeyPathString? = nil) -> CSSelectTerm { - - return self.init(.objectID(as: alias)) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSSelectTerm else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } @@ -178,344 +94,122 @@ public final class CSSelectTerm: NSObject { public let bridgeToSwift: SelectTerm public init(_ swiftValue: SelectTerm) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - SelectTerm +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension SelectTerm where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSelectTerm { - - return CSSelectTerm(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> SelectTerm { - - switch self { - - case ._attribute(let keyPath): - return SelectTerm._attribute(keyPath) - - case ._aggregate(let function, let keyPath, let alias, let nativeType): - return SelectTerm._aggregate(function: function, keyPath: keyPath, alias: alias, nativeType: nativeType) - - case ._identity(let alias, let nativeType): - return SelectTerm._identity(alias: alias, nativeType: nativeType) - } + + fatalError() } } // MARK: - CSSelect -/** - The `CSSelect` serves as the Objective-C bridging type for `Select`. - - - SeeAlso: `Select` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSelect: NSObject { - - /** - Creates a `CSSelect` clause for querying `NSNumber` values. - ``` - NSNumber *maxAge = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectNumber(CSAggregateMax(@"age")) - // ... - ``` - - parameter numberTerm: the `CSSelectTerm` specifying the attribute/aggregate value to query - */ + @objc public convenience init(numberTerm: CSSelectTerm) { - - self.init(Select(numberTerm.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSDecimalNumber` values. - ``` - NSDecimalNumber *averagePrice = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectDecimal(CSAggregateAverage(@"price")) - // ... - ``` - - parameter decimalTerm: the `CSSelectTerm` specifying the attribute/aggregate value to query - */ + @objc public convenience init(decimalTerm: CSSelectTerm) { - - self.init(Select(decimalTerm.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSString` values. - ``` - NSString *fullname = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectString(CSAttribute(@"fullname")) - // ... - ``` - - parameter stringTerm: the `CSSelectTerm` specifying the attribute/aggregate value to query - */ + @objc public convenience init(stringTerm: CSSelectTerm) { - - self.init(Select(stringTerm.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSDate` values. - ``` - NSDate *lastUpdate = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectDate(CSAggregateMax(@"updatedDate")) - // ... - ``` - - parameter dateTerm: the `CSSelectTerm` specifying the attribute/aggregate value to query - */ + @objc public convenience init(dateTerm: CSSelectTerm) { - - self.init(Select(dateTerm.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSData` values. - ``` - NSData *imageData = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectData(CSAttribute(@"imageData")) - // ... - ``` - - parameter dataTerm: the `CSSelectTerm` specifying the attribute/aggregate value to query - */ + @objc public convenience init(dataTerm: CSSelectTerm) { - - self.init(Select(dataTerm.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSManagedObjectID` values. - ``` - NSManagedObjectID *objectID = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectObjectID() - // ... - ``` - */ + @objc public convenience init(objectIDTerm: ()) { - - self.init(Select(.objectID())) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSDictionary` of an entity's attribute keys and values. - ``` - NSDictionary *keyValues = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect dictionaryForTerm:[CSSelectTerm maximum:@"age" as:nil]]]; - ``` - - parameter term: the `CSSelectTerm` specifying the attribute/aggregate value to query - - returns: a `CSSelect` clause for querying an entity attribute - */ + @objc public static func dictionaryForTerm(_ term: CSSelectTerm) -> CSSelect { - - return self.init(Select(term.bridgeToSwift)) + + fatalError() } - - /** - Creates a `CSSelect` clause for querying `NSDictionary` of an entity's attribute keys and values. - ``` - NSDictionary *keyValues = [CSCoreStore - queryValueFrom:[CSFrom entityClass:[MyPersonEntity class]] - select:[CSSelect dictionaryForTerms:@[ - [CSSelectTerm attribute:@"name" as:nil], - [CSSelectTerm attribute:@"age" as:nil] - ]]]; - ``` - - parameter terms: the `CSSelectTerm`s specifying the attribute/aggregate values to query - - returns: a `CSSelect` clause for querying an entity attribute - */ + @objc public static func dictionaryForTerms(_ terms: [CSSelectTerm]) -> CSSelect { - - return self.init(Select(terms.map { $0.bridgeToSwift })) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.attributeType.hashValue - ^ self.selectTerms.map { $0.hashValue }.reduce(0, ^) + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSSelect else { - - return false - } - return self.attributeType == object.attributeType - && self.selectTerms == object.selectTerms + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } // MARK: CoreStoreObjectiveCType public init(_ swiftValue: Select) { - - self.attributeType = T.cs_rawAttributeType - self.selectTerms = swiftValue.selectTerms.map({ $0.downcast() }) - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } public init(_ swiftValue: Select) { - - self.attributeType = .undefinedAttributeType - self.selectTerms = swiftValue.selectTerms.map({ $0.downcast() }) - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } - - - // MARK: Internal - - internal let attributeType: NSAttributeType - internal let selectTerms: [SelectTerm] - - - // MARK: Internal - - internal func applyToFetchRequest(_ fetchRequest: NSFetchRequest) { - - fetchRequest.includesPendingChanges = false - fetchRequest.resultType = .dictionaryResultType - - func attributeDescription(for keyPath: String, in entity: NSEntityDescription) -> NSAttributeDescription? { - - let components = keyPath.components(separatedBy: ".") - switch components.count { - - case 0: - return nil - - case 1: - return entity.attributesByName[components[0]] - - default: - guard let relationship = entity.relationshipsByName[components[0]], - let destinationEntity = relationship.destinationEntity else { - - return nil - } - return attributeDescription( - for: components.dropFirst().joined(separator: "."), - in: destinationEntity - ) - } - } - - var propertiesToFetch = [Any]() - for term in self.selectTerms { - - switch term { - - case ._attribute(let keyPath): - propertiesToFetch.append(keyPath) - - case ._aggregate(let function, let keyPath, let alias, let nativeType): - let entityDescription = fetchRequest.entity! - if let attributeDescription = attributeDescription(for: keyPath, in: entityDescription) { - - let expressionDescription = NSExpressionDescription() - expressionDescription.name = alias - if nativeType == .undefinedAttributeType { - - expressionDescription.expressionResultType = attributeDescription.attributeType - } - else { - - expressionDescription.expressionResultType = nativeType - } - expressionDescription.expression = NSExpression( - forFunction: function, - arguments: [NSExpression(forKeyPath: keyPath)] - ) - propertiesToFetch.append(expressionDescription) - } - else { - - Internals.log( - .warning, - message: "The key path \"\(keyPath)\" could not be resolved in entity \(Internals.typeName(entityDescription.managedObjectClassName)) as an attribute and will be ignored by \(Internals.typeName(self)) query clause." - ) - } - - case ._identity(let alias, let nativeType): - let expressionDescription = NSExpressionDescription() - expressionDescription.name = alias - if nativeType == .undefinedAttributeType { - - expressionDescription.expressionResultType = .objectIDAttributeType - } - else { - - expressionDescription.expressionResultType = nativeType - } - expressionDescription.expression = NSExpression.expressionForEvaluatedObject() - - propertiesToFetch.append(expressionDescription) - } - } - - fetchRequest.propertiesToFetch = propertiesToFetch - } - - - // MARK: Private - - private let bridgeToSwift: CoreStoreDebugStringConvertible } // MARK: - Select +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension Select where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSelect { - - return CSSelect(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> Select { - - return Select(self.selectTerms.map({ $0.downcast() })) + + fatalError() } } diff --git a/Sources/CSSetupResult.swift b/Sources/CSSetupResult.swift index cf5e788..55bb63d 100644 --- a/Sources/CSSetupResult.swift +++ b/Sources/CSSetupResult.swift @@ -29,162 +29,83 @@ import CoreData // MARK: - CSSetupResult -/** - The `CSSetupResult` serves as the Objective-C bridging type for `SetupResult`. - - - SeeAlso: `SetupResult` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSetupResult: NSObject { - - /** - `YES` if adding the `CSStorageInterface` to the `CSDataStack` succeeded, `NO` otherwise. - */ + @objc public var isSuccess: Bool { - - return self.storage != nil + + fatalError() } - - /** - `YES` if adding the `CSStorageInterface` to the `CSDataStack` failed, `NO` otherwise. When `YES`, the `error` property returns the actual `NSError` for the failure. - */ + @objc public var isFailure: Bool { - - return self.storage == nil + + fatalError() } - - /** - A `CSStorageInterface` instance if the `commit` operation for the transaction succeeded. Returns `nil` otherwise. - */ + @objc public let storage: CSStorageInterface? - - /** - The `NSError` for a failed `commit` operation, or `nil` if the `commit` succeeded - */ + @objc public let error: NSError? - - /** - If the result was a success, the `success` block is executed with the `CSStorageInterface` instance that was added to the `CSDataStack`. If the result was a failure, the `failure` block is executed with an `NSError` argument pertaining to the actual error. - - The blocks are executed immediately as `@noescape` and will not be retained. - - - parameter success: the block to execute on success. The block passes a `CSStorageInterface` instance that was added to the `CSDataStack`. - - parameter failure: the block to execute on failure. The block passes an `NSError` argument that pertains to the actual error. - */ + @objc public func handleSuccess(_ success: (_ storage: CSStorageInterface) -> Void, failure: (_ error: NSError) -> Void) { - - if let storage = self.storage { - - success(storage) - } - else { - - failure(self.error!) - } + + fatalError() } - - /** - If the result was a success, the `success` block is executed with a `BOOL` argument that indicates if there were any changes made. If the result was a failure, this method does nothing. - - The block is executed immediately as `@noescape` and will not be retained. - - - parameter success: the block to execute on success. The block passes a `BOOL` argument that indicates if there were any changes made. - */ + @objc public func handleSuccess(_ success: (_ storage: CSStorageInterface) -> Void) { - - guard let storage = self.storage else { - - return - } - success(storage) + + fatalError() } - - /** - If the result was a failure, the `failure` block is executed with an `NSError` argument pertaining to the actual error. If the result was a success, this method does nothing. - - The block is executed immediately as `@noescape` and will not be retained. - - - parameter failure: the block to execute on failure. The block passes an `NSError` argument that pertains to the actual error. - */ + @objc public func handleFailure(_ failure: (_ error: NSError) -> Void) { - - guard let error = self.error else { - - return - } - failure(error) + + fatalError() } // MARK: NSObject public override var hash: Int { - - if let storage = self.storage { - - return self.isSuccess.hashValue ^ ObjectIdentifier(storage).hashValue - } - return self.isSuccess.hashValue ^ self.error!.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSSetupResult else { - - return false - } - return self.storage === object.storage - && self.error == object.error + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } // MARK: CoreStoreObjectiveCType public required init(_ swiftValue: SetupResult) where T: CoreStoreSwiftType, T.ObjectiveCType: CSStorageInterface { - - switch swiftValue { - - case .success(let storage): - self.storage = storage.bridgeToObjectiveC - self.error = nil - - case .failure(let error): - self.storage = nil - self.error = error.bridgeToObjectiveC - } - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } - - - // MARK: Private - - private let bridgeToSwift: CoreStoreDebugStringConvertible } // MARK: - SetupResult -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension SetupResult where Success: StorageInterface, Success: CoreStoreSwiftType, Success.ObjectiveCType: CSStorageInterface, Failure == CoreStoreError { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSetupResult { - - return CSSetupResult(self) + + fatalError() } } diff --git a/Sources/CSStorageInterface.swift b/Sources/CSStorageInterface.swift index d8e0906..4a5d1c0 100644 --- a/Sources/CSStorageInterface.swift +++ b/Sources/CSStorageInterface.swift @@ -29,29 +29,16 @@ import CoreData // MARK: - CSStorageInterface -/** - The `CSStorageInterface` serves as the Objective-C bridging type for `StorageInterface`. - - - SeeAlso: `StorageInterface` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSStorageInterface { - - /** - The string identifier for the `NSPersistentStore`'s `type` property. This is the same string CoreStore will use to create the `NSPersistentStore` from the `NSPersistentStoreCoordinator`'s `addPersistentStoreWithType(...)` method. - */ + @objc static var storeType: String { get } - - /** - The configuration name in the model file - */ + @objc var configuration: ModelConfiguration { get } - - /** - The options dictionary for the `NSPersistentStore` - */ + @objc var storeOptions: [AnyHashable: Any]? { get } } @@ -59,67 +46,32 @@ public protocol CSStorageInterface { // MARK: - CSLocalStorageOptions -/** - The `CSLocalStorageOptions` provides settings that tells the `CSDataStack` how to setup the persistent store for `CSLocalStorage` implementers. - - - SeeAlso: `LocalStorageOptions` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public enum CSLocalStorageOptions: Int { - - /** - Tells the `DataStack` that the store should not be migrated or recreated, and should simply fail on model mismatch - */ + case none = 0 - - /** - Tells the `DataStack` to delete and recreate the store on model mismatch, otherwise exceptions will be thrown on failure instead - */ case recreateStoreOnModelMismatch = 1 - - /** - Tells the `DataStack` to prevent progressive migrations for the store - */ case preventProgressiveMigration = 2 - - /** - Tells the `DataStack` to allow lightweight migration for the store when added synchronously - */ case allowSynchronousLightweightMigration = 4 } // MARK: - CSLocalStorage -/** - The `CSLocalStorage` serves as the Objective-C bridging type for `LocalStorage`. - - - SeeAlso: `LocalStorage` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public protocol CSLocalStorage: CSStorageInterface { - - /** - The `NSURL` that points to the store file - */ + @objc var fileURL: URL { get } - - /** - An array of `SchemaMappingProvider`s that provides the complete mapping models for custom migrations. This is currently only supported for Swift code. - */ + @objc var migrationMappingProviders: [Any] { get } - - /** - Options that tell the `CSDataStack` how to setup the persistent store - */ + @objc var localStorageOptions: Int { get } - /** - Called by the `CSDataStack` to perform actual deletion of the store file from disk. Do not call directly! The `sourceModel` argument is a hint for the existing store's model version. Implementers can use the `sourceModel` to perform necessary store operations. (SQLite stores for example, can convert WAL journaling mode to DELETE before deleting) - */ @objc func cs_eraseStorageAndWait(metadata: NSDictionary, soureModelHint: NSManagedObjectModel?, error: NSErrorPointer) -> Bool } diff --git a/Sources/CSSynchronousDataTransaction.swift b/Sources/CSSynchronousDataTransaction.swift index aef28cd..a60e155 100644 --- a/Sources/CSSynchronousDataTransaction.swift +++ b/Sources/CSSynchronousDataTransaction.swift @@ -29,100 +29,54 @@ import CoreData // MARK: - CSSynchronousDataTransaction -/** - The `CSSynchronousDataTransaction` serves as the Objective-C bridging type for `SynchronousDataTransaction`. - - - SeeAlso: `SynchronousDataTransaction` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSSynchronousDataTransaction: CSBaseDataTransaction, CoreStoreObjectiveCType { - - /** - Saves the transaction changes and waits for completion synchronously. This method should not be used after the `-commitAndWaitWithError:` method was already called once. - - - parameter error: the `CSError` pointer that indicates the reason in case of an failure - - returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information. - */ + @objc public func commitAndWait(error: NSErrorPointer) -> Bool { - - return bridge(error) { - - if case (_, let error?) = self.bridgeToSwift.context.saveSynchronously(waitForMerge: true) { - - throw error - } - } + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } // MARK: BaseDataTransaction - - /** - Creates a new `NSManagedObject` with the specified entity type. - - - parameter into: the `CSInto` clause indicating the destination `NSManagedObject` entity type and the destination configuration - - returns: a new `NSManagedObject` instance of the specified entity type. - */ + @objc public override func createInto(_ into: CSInto) -> Any { - - return self.bridgeToSwift.create(into.bridgeToSwift) + + fatalError() } - - /** - Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `-commitAndWait` method was already called once. - - - parameter object: the `NSManagedObject` type to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ + @objc public override func editObject(_ object: NSManagedObject?) -> Any? { - - return self.bridgeToSwift.edit(object) + + fatalError() } - - /** - Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `-commitAndWait` method was already called once. - - - parameter into: a `CSInto` clause specifying the entity type - - parameter objectID: the `NSManagedObjectID` for the object to be edited - - returns: an editable proxy for the specified `NSManagedObject`. - */ + @objc public override func editInto(_ into: CSInto, objectID: NSManagedObjectID) -> Any? { - - return self.bridgeToSwift.edit(into.bridgeToSwift, objectID) + + fatalError() } - - /** - Deletes a specified `NSManagedObject`. This method should not be used after the `-commitAndWait` method was already called once. - - - parameter object: the `NSManagedObject` type to be deleted - */ + @objc public override func deleteObject(_ object: NSManagedObject?) { - - return self.bridgeToSwift.delete(object) + + fatalError() } - - /** - Deletes the specified `NSManagedObject`s. - - - parameter objects: the `NSManagedObject`s to be deleted - */ + public override func deleteObjects(_ objects: [NSManagedObject]) { - - self.bridgeToSwift.delete(objects) + + fatalError() } @@ -131,31 +85,26 @@ public final class CSSynchronousDataTransaction: CSBaseDataTransaction, CoreStor public typealias SwiftType = SynchronousDataTransaction public var bridgeToSwift: SynchronousDataTransaction { - - return super.swiftTransaction as! SynchronousDataTransaction + + fatalError() } public required init(_ swiftValue: SynchronousDataTransaction) { - - super.init(swiftValue as BaseDataTransaction) - } - - public required override init(_ swiftValue: BaseDataTransaction) { - - super.init(swiftValue) + + fatalError() } } // MARK: - SynchronousDataTransaction -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension SynchronousDataTransaction: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSSynchronousDataTransaction { - - return CSSynchronousDataTransaction(self) + + fatalError() } } diff --git a/Sources/CSTweak.swift b/Sources/CSTweak.swift index a852780..4badf1d 100644 --- a/Sources/CSTweak.swift +++ b/Sources/CSTweak.swift @@ -29,42 +29,28 @@ import CoreData // MARK: - CSTweak -/** - The `CSTweak` serves as the Objective-C bridging type for `Tweak`. - - - SeeAlso: `Tweak` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSTweak: NSObject, CSFetchClause, CSQueryClause, CSDeleteClause, CoreStoreObjectiveCType { - /** - The block to customize the `NSFetchRequest` - */ @objc public var block: (_ fetchRequest: NSFetchRequest) -> Void { - - return self.bridgeToSwift.closure + + fatalError() } - - /** - Initializes a `CSTweak` clause with a closure where the `NSFetchRequest` may be configured. - - - Important: `CSTweak`'s closure is executed only just before the fetch occurs, so make sure that any values captured by the closure is not prone to race conditions. Also, some utilities (such as `CSListMonitor`s) may keep `CSFetchClause`s in memory and may thus introduce retain cycles if reference captures are not handled properly. - - parameter block: the block to customize the `NSFetchRequest` - */ + @objc public convenience init(block: @escaping (_ fetchRequest: NSFetchRequest) -> Void) { - - self.init(Tweak(block)) + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -72,8 +58,8 @@ public final class CSTweak: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau @objc public func applyToFetchRequest(_ fetchRequest: NSFetchRequest) { - - self.bridgeToSwift.applyToFetchRequest(fetchRequest) + + fatalError() } @@ -82,22 +68,21 @@ public final class CSTweak: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau public let bridgeToSwift: Tweak public init(_ swiftValue: Tweak) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - Tweak -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension Tweak: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSTweak { - - return CSTweak(self) + + fatalError() } } diff --git a/Sources/CSUnsafeDataModelSchema.swift b/Sources/CSUnsafeDataModelSchema.swift index f0a3a39..3be207a 100644 --- a/Sources/CSUnsafeDataModelSchema.swift +++ b/Sources/CSUnsafeDataModelSchema.swift @@ -29,50 +29,32 @@ import Foundation // MARK: - CSUnsafeDataModelSchema -/** - The `CSUnsafeDataModelSchema` serves as the Objective-C bridging type for `UnsafeDataModelSchema`. - - - SeeAlso: `UnsafeDataModelSchema` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSUnsafeDataModelSchema: NSObject, CSDynamicSchema, CoreStoreObjectiveCType { - /** - Initializes a `CSUnsafeDataModelSchema` from an `NSManagedObjectModel`. - - - parameter modelName: the model version, typically the file name of an *.xcdatamodeld file (without the file extension) - - parameter model: the `NSManagedObjectModel` - */ @objc public required init(modelName: ModelVersion, model: NSManagedObjectModel) { - - self.bridgeToSwift = UnsafeDataModelSchema( - modelName: modelName, - model: model - ) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.bridgeToSwift).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSUnsafeDataModelSchema else { - - return false - } - return self.bridgeToSwift === object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -80,14 +62,14 @@ public final class CSUnsafeDataModelSchema: NSObject, CSDynamicSchema, CoreStore @objc public var modelVersion: ModelVersion { - - return self.bridgeToSwift.modelVersion + + fatalError() } @objc public func rawModel() -> NSManagedObjectModel { - - return self.bridgeToSwift.rawModel() + + fatalError() } @@ -96,22 +78,21 @@ public final class CSUnsafeDataModelSchema: NSObject, CSDynamicSchema, CoreStore public let bridgeToSwift: UnsafeDataModelSchema public required init(_ swiftValue: UnsafeDataModelSchema) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - UnsafeDataModelSchema -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension UnsafeDataModelSchema: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSUnsafeDataModelSchema { - - return CSUnsafeDataModelSchema(self) + + fatalError() } } diff --git a/Sources/CSUnsafeDataTransaction.swift b/Sources/CSUnsafeDataTransaction.swift index 236d7d2..524af7f 100644 --- a/Sources/CSUnsafeDataTransaction.swift +++ b/Sources/CSUnsafeDataTransaction.swift @@ -29,160 +29,76 @@ import CoreData // MARK: - CSUnsafeDataTransaction -/** - The `CSUnsafeDataTransaction` serves as the Objective-C bridging type for `UnsafeDataTransaction`. - - - SeeAlso: `UnsafeDataTransaction` - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSUnsafeDataTransaction: CSBaseDataTransaction, CoreStoreObjectiveCType { - /** - Saves the transaction changes asynchronously. For a `CSUnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread. - - - parameter success: the block executed if the save succeeds. - - parameter failure: the block executed if the save fails. A `CSError` is reported as the argument of the block. - */ + @objc public func commitWithSuccess(_ success: (() -> Void)?, _ failure: ((CSError) -> Void)?) { - - self.bridgeToSwift.context.saveAsynchronouslyWithCompletion { (_, error) in - - defer { - - withExtendedLifetime(self, {}) - } - if let error = error { - - failure?(error.bridgeToObjectiveC) - } - else { - - success?() - } - } + + fatalError() } - - /** - Saves the transaction changes and waits for completion synchronously. For a `CSUnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread. - - - parameter error: the `CSError` pointer that indicates the reason in case of an failure - - returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information. - */ + @objc public func commitAndWait(error: NSErrorPointer) -> Bool { - - return bridge(error) { - - if case (_, let error?) = self.bridgeToSwift.context.saveSynchronously(waitForMerge: true) { - - throw error - } - } + + fatalError() } - - /** - Rolls back the transaction. - */ + @objc public func rollback() { - - self.bridgeToSwift.rollback() + + fatalError() } - - /** - Undo's the last change made to the transaction. - */ + @objc public func undo() { - - self.bridgeToSwift.undo() + + fatalError() } - - /** - Redo's the last undone change to the transaction. - */ + @objc public func redo() { - - self.bridgeToSwift.redo() + + fatalError() } - - /** - Immediately flushes all pending changes to the transaction's observers. This is useful in conjunction with `ListMonitor`s and `ObjectMonitor`s created from `UnsafeDataTransaction`s used to manage temporary "scratch" data. - - - Important: Note that unlike `commit()`, `flush()` does not propagate/save updates to the `DataStack` and the persistent store. However, the flushed changes will be seen by children transactions created further from the current transaction (i.e. through `transaction.beginUnsafe()`) - */ + @objc public func flush() { - - self.bridgeToSwift.flush() + + fatalError() } - - /** - Flushes all pending changes to the transaction's observers at the end of the `closure`'s execution. This is useful in conjunction with `ListMonitor`s and `ObjectMonitor`s created from `UnsafeDataTransaction`s used to manage temporary "scratch" data. - - - Important: Note that unlike `commit()`, `flush()` does not propagate/save updates to the `DataStack` and the persistent store. However, the flushed changes will be seen by children transactions created further from the current transaction (i.e. through `transaction.beginUnsafe()`) - - parameter block: the block where changes can be made prior to the flush - */ + @objc public func flush(_ block: () -> Void) { - - self.bridgeToSwift.flush { - - block() - } + + fatalError() } - - /** - Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - To support "undo" methods such as `-undo`, `-redo`, and `-rollback`, use the `-beginSafeWithSupportsUndo:` method passing `YES` to the argument. Without "undo" support, calling those methods will raise an exception. - - returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made. - */ + @objc public func beginUnsafe() -> CSUnsafeDataTransaction { - - return bridge { - - self.bridgeToSwift.beginUnsafe() - } + + fatalError() } - - /** - Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - - prameter supportsUndo: `-undo`, `-redo`, and `-rollback` methods are only available when this parameter is `YES`, otherwise those method will raise an exception. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. - - returns: a `CSUnsafeDataTransaction` instance where creates, updates, and deletes can be made. - */ + @objc public func beginUnsafeWithSupportsUndo(_ supportsUndo: Bool) -> CSUnsafeDataTransaction { - - return bridge { - - self.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo) - } + + fatalError() } - - /** - Returns the `NSManagedObjectContext` for this unsafe transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with. - - Note that it is the developer's responsibility to ensure the following: - - that the `CSUnsafeDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime - - that all saves will be done either through the `CSUnsafeDataTransaction`'s `-commit:` or `-commitAndWait` method, or by calling `-save:` manually on the context, its parent, and all other ancestor contexts if there are any. - */ + @objc public func unsafeContext() -> NSManagedObjectContext { - - return self.bridgeToSwift.context + + fatalError() } // MARK: NSObject public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -191,31 +107,26 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction, CoreStoreObje public typealias SwiftType = UnsafeDataTransaction public var bridgeToSwift: UnsafeDataTransaction { - - return super.swiftTransaction as! UnsafeDataTransaction + + fatalError() } public required init(_ swiftValue: UnsafeDataTransaction) { - - super.init(swiftValue as BaseDataTransaction) - } - - public required override init(_ swiftValue: BaseDataTransaction) { - - super.init(swiftValue) + + fatalError() } } // MARK: - UnsafeDataTransaction -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension UnsafeDataTransaction: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSUnsafeDataTransaction { - - return CSUnsafeDataTransaction(self) + + fatalError() } } diff --git a/Sources/CSWhere.swift b/Sources/CSWhere.swift index b77aeeb..f916ab4 100644 --- a/Sources/CSWhere.swift +++ b/Sources/CSWhere.swift @@ -29,112 +29,62 @@ import CoreData // MARK: - CSWhere -/** - The `CSWhere` serves as the Objective-C bridging type for `Where`. - - - SeeAlso: `Where` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClause { - /** - The internal `NSPredicate` instance for the `Where` clause - */ @objc public var predicate: NSPredicate { - - return self.bridgeToSwift.predicate + + fatalError() } - /** - Initializes a `CSWhere` clause with a predicate that always evaluates to the specified boolean value - ``` - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSWhereValue(YES)]]]; - ``` - - parameter value: the boolean value for the predicate - */ @objc public convenience init(value: Bool) { - - self.init(Where(value)) + + fatalError() } - - /** - Initializes a `CSWhere` clause with a predicate using the specified string format and arguments - ``` - NSPredicate *predicate = // ... - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSWherePredicate(predicate)]]; - ``` - - parameter format: the format string for the predicate - - parameter argumentArray: the arguments for `format` - */ + @objc public convenience init(format: String, argumentArray: [NSObject]?) { - - self.init(Where(format, argumentArray: argumentArray)) + + fatalError() } - - /** - Initializes a `CSWhere` clause that compares equality - - - parameter keyPath: the keyPath to compare with - - parameter value: the arguments for the `==` operator - */ + @objc public convenience init(keyPath: KeyPathString, isEqualTo value: CoreDataNativeType?) { - - self.init(value == nil || value is NSNull - ? Where("\(keyPath) == nil") - : Where("\(keyPath) == %@", value!)) + + fatalError() } - - /** - Initializes a `CSWhere` clause that compares membership - - - parameter keyPath: the keyPath to compare with - - parameter list: the array to check membership of - */ + @objc public convenience init(keyPath: KeyPathString, isMemberOf list: [CoreDataNativeType]) { - - self.init(Where("\(keyPath) IN %@", list as NSArray)) + + fatalError() } - - /** - Initializes a `CSWhere` clause with an `NSPredicate` - - - parameter predicate: the `NSPredicate` for the fetch or query - */ + @objc public convenience init(predicate: NSPredicate) { - - self.init(Where(predicate)) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return self.bridgeToSwift.hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSWhere else { - - return false - } - return self.bridgeToSwift == object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -142,8 +92,8 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau @objc public func applyToFetchRequest(_ fetchRequest: NSFetchRequest) { - - self.bridgeToSwift.applyToFetchRequest(fetchRequest) + + fatalError() } @@ -152,29 +102,21 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau public let bridgeToSwift: Where public init(_ swiftValue: Where) { - - self.bridgeToSwift = swiftValue.downcast() - super.init() + + fatalError() } } // MARK: - Where +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension Where where O: NSManagedObject { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSWhere { - - return CSWhere(self) - } - - - // MARK: FilePrivate - - fileprivate func downcast() -> Where { - - return Where(self.predicate) + + fatalError() } } diff --git a/Sources/CSXcodeDataModelSchema.swift b/Sources/CSXcodeDataModelSchema.swift index 8b4f428..a6318c7 100644 --- a/Sources/CSXcodeDataModelSchema.swift +++ b/Sources/CSXcodeDataModelSchema.swift @@ -29,50 +29,32 @@ import Foundation // MARK: - CSXcodeDataModelSchema -/** - The `CSXcodeDataModelSchema` serves as the Objective-C bridging type for `XcodeDataModelSchema`. - - - SeeAlso: `XcodeDataModelSchema` - */ +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") @objc -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") public final class CSXcodeDataModelSchema: NSObject, CSDynamicSchema, CoreStoreObjectiveCType { - /** - Initializes an `CSXcodeDataModelSchema` from an *.xcdatamodeld file URL. - - - parameter modelName: the model version, typically the file name of an *.xcdatamodeld file (without the file extension) - - parameter modelVersionFileURL: the file URL that points to the .xcdatamodeld's "momd" file. - */ @objc public required init(modelName: ModelVersion, modelVersionFileURL: URL) { - - self.bridgeToSwift = XcodeDataModelSchema( - modelName: modelName, - modelVersionFileURL: modelVersionFileURL - ) + + fatalError() } // MARK: NSObject public override var hash: Int { - - return ObjectIdentifier(self.bridgeToSwift).hashValue + + fatalError() } public override func isEqual(_ object: Any?) -> Bool { - - guard let object = object as? CSXcodeDataModelSchema else { - - return false - } - return self.bridgeToSwift === object.bridgeToSwift + + fatalError() } public override var description: String { - - return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)" + + fatalError() } @@ -80,14 +62,14 @@ public final class CSXcodeDataModelSchema: NSObject, CSDynamicSchema, CoreStoreO @objc public var modelVersion: ModelVersion { - - return self.bridgeToSwift.modelVersion + + fatalError() } @objc public func rawModel() -> NSManagedObjectModel { - - return self.bridgeToSwift.rawModel() + + fatalError() } @@ -96,22 +78,21 @@ public final class CSXcodeDataModelSchema: NSObject, CSDynamicSchema, CoreStoreO public let bridgeToSwift: XcodeDataModelSchema public required init(_ swiftValue: XcodeDataModelSchema) { - - self.bridgeToSwift = swiftValue - super.init() + + fatalError() } } // MARK: - XcodeDataModelSchema -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension XcodeDataModelSchema: CoreStoreSwiftType { // MARK: CoreStoreSwiftType public var bridgeToObjectiveC: CSXcodeDataModelSchema { - - return CSXcodeDataModelSchema(self) + + fatalError() } } diff --git a/Sources/CoreStoreBridge.h b/Sources/CoreStoreBridge.h index e7a4715..c67d4e5 100644 --- a/Sources/CoreStoreBridge.h +++ b/Sources/CoreStoreBridge.h @@ -37,7 +37,7 @@ #error CoreStore Objective-C utilities can only be used on platforms that support C function overloading #endif -#define CORESTORE_EXTERN extern __deprecated_msg("CoreStore Objective-C API will be removed soon.") +#define CORESTORE_EXTERN extern __deprecated_msg("CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") #define CORESTORE_OVERLOADABLE __attribute__((__overloadable__)) #define CORESTORE_REQUIRES_NIL_TERMINATION __attribute__((sentinel(0, 1))) #define CORESTORE_RETURNS_RETAINED __attribute__((ns_returns_retained)) @@ -46,12 +46,14 @@ #pragma mark - KeyPathString Utilities #define CSKeyPath(type, property) ({ \ + CORESTORE_OBJC_OBSOLETE; \ type *_je_keypath_dummy __attribute__((unused)); \ typeof(_je_keypath_dummy.property) _je_keypath_dummy_property __attribute__((unused)); \ @#property; \ }) #define CSKeyPathOperator(operator, type, property) ({ \ + CORESTORE_OBJC_OBSOLETE; \ type *_je_keypath_dummy __attribute__((unused)); \ typeof(_je_keypath_dummy.property) _je_keypath_dummy_property __attribute__((unused)); \ @"@" #operator "." #property; \ @@ -65,85 +67,19 @@ @class CSFrom; -/** - @abstract - Initializes a CSFrom clause with the specified entity class. - - @code - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class])]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @result - a CSFrom clause with the specified entity class - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSFrom clause with the specified configuration. - - @code - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class], @"Configuration1")]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @param configuration - an NSPersistentStore configuration name to associate objects from. This parameter is required if multiple configurations contain the created NSManagedObject's entity type. Set to [NSNull null] to use the default configuration. - - @result - a CSFrom clause with the specified configuration - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSFrom clause with the specified configuration. - - @code - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class], @"Configuration1")]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @param configuration - an NSPersistentStore configuration name to associate objects from. This parameter is required if multiple configurations contain the created NSManagedObject's entity type. Set to [NSNull null] to use the default configuration. - - @result - a CSFrom clause with the specified configuration - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSFrom clause with the specified configurations. - - @code - MyPersonEntity *people = [transaction fetchAllFrom: - CSFromClass([MyPersonEntity class], - @[[NSNull null], @"Configuration1"])]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @param configurations - an array of the NSPersistentStore configuration names to associate objects from. This parameter is required if multiple configurations contain the created NSManagedObject's entity type. Set to [NSNull null] to use the default configuration. - - @result - a CSFrom clause with the specified configurations - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSArray *_Nonnull configurations) CORESTORE_RETURNS_RETAINED; @@ -152,42 +88,15 @@ CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSArray *_Nonnull c @class CSGroupBy; -/** - @abstract - Initializes a CSGroupBy clause with a key path string - - @param keyPath - a key path string to group results with - - @result - a CSGroupBy clause with a key path string - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSGroupBy *_Nonnull CSGroupByKeyPath(NSString *_Nonnull keyPath) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSGroupBy clause with a list of key path strings - - @param keyPath - a nil-terminated list of key path strings to group results with - - @result - a CSGroupBy clause with a list of key path strings - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSGroupBy *_Nonnull CSGroupByKeyPaths(NSString *_Nonnull keyPath, ...) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSGroupBy clause with a list of key path strings - - @param keyPaths - a list of key path strings to group results with - - @result - a CSGroupBy clause with a list of key path strings - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSGroupBy *_Nonnull CSGroupByKeyPaths(NSArray *_Nonnull keyPaths) CORESTORE_RETURNS_RETAINED; @@ -196,63 +105,15 @@ CSGroupBy *_Nonnull CSGroupByKeyPaths(NSArray *_Nonnull keyPaths) CO @class CSInto; -/** - @abstract - Initializes a CSInto clause with the specified entity class. - - @code - MyPersonEntity *people = [transaction createInto: - CSIntoClass([MyPersonEntity class])]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @result - a CSInto clause with the specified entity class - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSInto clause with the specified entity class. - - @code - MyPersonEntity *people = [transaction createInto: - CSIntoClass([MyPersonEntity class], [NSNull null])]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @param configuration - an NSPersistentStore configuration name to associate objects from. This parameter is required if multiple configurations contain the created NSManagedObject's entity type. Set to [NSNull null] to use the default configuration. - - @result - a CSInto clause with the specified entity class - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSInto clause with the specified entity class. - - @code - MyPersonEntity *people = [transaction createInto: - CSIntoClass([MyPersonEntity class], @"Configuration1")]; - @endcode - - @param entityClass - the NSManagedObject class type to be created - - @param configuration - an NSPersistentStore configuration name to associate objects from. This parameter is required if multiple configurations contain the created NSManagedObject's entity type. Set to [NSNull null] to use the default configuration. - - @result - a CSInto clause with the specified entity class - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CORESTORE_RETURNS_RETAINED; @@ -261,98 +122,23 @@ CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSString *_Nonnull conf @class CSOrderBy; -/** - @abstract - Syntax sugar for initializing an ascending NSSortDescriptor for use with CSOrderBy - - @code - MyPersonEntity *people = [CSCoreStore - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKey(CSSortAscending(@"fullname"))]]]; - @endcode - - @param key - the attribute key to sort with - - @result - an NSSortDescriptor for use with CSOrderBy - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN NSSortDescriptor *_Nonnull CSSortAscending(NSString *_Nonnull key) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Syntax sugar for initializing a descending NSSortDescriptor for use with CSOrderBy - - @code - MyPersonEntity *people = [CSCoreStore - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKey(CSSortDescending(@"fullname"))]]]; - @endcode - - @param key - the attribute key to sort with - - @result - an NSSortDescriptor for use with CSOrderBy - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN NSSortDescriptor *_Nonnull CSSortDescending(NSString *_Nonnull key) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSOrderBy clause with a single sort descriptor - - @code - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKey(CSSortAscending(@"fullname"))]]]; - @endcode - - @param sortDescriptor - an NSSortDescriptor - - @result - a CSOrderBy clause with a single sort descriptor - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSOrderBy *_Nonnull CSOrderByKey(NSSortDescriptor *_Nonnull sortDescriptor) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSOrderBy clause with a list of sort descriptors - - @code - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKeys(CSSortAscending(@"fullname"), CSSortDescending(@"age"), nil))]]]; - @endcode - - @param sortDescriptor - a nil-terminated array of NSSortDescriptors - - @result - a CSOrderBy clause with a list of sort descriptors - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSOrderBy *_Nonnull CSOrderByKeys(NSSortDescriptor *_Nonnull sortDescriptor, ...) CORESTORE_RETURNS_RETAINED CORESTORE_REQUIRES_NIL_TERMINATION; -/** - @abstract - Initializes a CSOrderBy clause with a list of sort descriptors - - @code - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSOrderByKeys(@[CSSortAscending(@"fullname"), CSSortDescending(@"age")]))]]]; - @endcode - - @param sortDescriptors - an array of NSSortDescriptors - - @result - a CSOrderBy clause with a list of sort descriptors - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSOrderBy *_Nonnull CSOrderByKeys(NSArray *_Nonnull sortDescriptors) CORESTORE_RETURNS_RETAINED; @@ -362,120 +148,27 @@ CSOrderBy *_Nonnull CSOrderByKeys(NSArray *_Nonnull sortDesc @class CSSelect; @class CSSelectTerm; -/** - @abstract - Creates a CSSelect clause for querying an NSNumber value - - @code - NSNumber *maxAge = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectNumber(CSAggregateMax(@"age")) - // ... - @endcode - - @param selectTerm - the CSSelectTerm specifying the attribute/aggregate value to query - - @result - a CSSelect clause for querying an NSNumber value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectNumber(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Creates a CSSelect clause for querying an NSDecimalNumber value - - @code - NSDecimalNumber *averagePrice = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectDecimal(CSAggregateAverage(@"price")) - // ... - @endcode - - @param selectTerm - the CSSelectTerm specifying the attribute/aggregate value to query - - @result - a CSSelect clause for querying an NSDecimalNumber value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectDecimal(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Creates a CSSelect clause for querying an NSString value - - @code - NSString *fullname = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectString(CSAttribute(@"fullname")) - // ... - @endcode - - @param selectTerm - the CSSelectTerm specifying the attribute/aggregate value to query - - @result - a CSSelect clause for querying an NSString value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectString(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Creates a CSSelect clause for querying an NSDate value - - @code - NSDate *lastUpdate = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectDate(CSAggregateMax(@"updatedDate")) - // ... - @endcode - - @param selectTerm - the CSSelectTerm specifying the attribute/aggregate value to query - - @result - a CSSelect clause for querying an NSDate value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectDate(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Creates a CSSelect clause for querying an NSData value - - @code - NSData *imageData = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectData(CSAttribute(@"imageData")) - // ... - @endcode - - @param selectTerm - the CSSelectTerm specifying the attribute/aggregate value to query - - @result - a CSSelect clause for querying an NSData value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectData(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Creates a CSSelect clause for querying an NSManagedObjectID value - - @code - NSManagedObjectID *objectID = [CSCoreStore - queryValueFrom:CSFromClass([MyPersonEntity class]) - select:CSSelectObjectID() - // ... - @endcode - - @result - a CSSelect clause for querying an NSManagedObjectID value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSSelect *_Nonnull CSSelectObjectID(void) CORESTORE_RETURNS_RETAINED; @@ -484,19 +177,7 @@ CSSelect *_Nonnull CSSelectObjectID(void) CORESTORE_RETURNS_RETAINED; @class CSTweak; -/** - @abstract - Initializes a CSTweak clause with a block where the NSFetchRequest may be configured. - - @important - CSTweak's closure is executed only just before the fetch occurs, so make sure that any values captured by the closure is not prone to race conditions. Also, some utilities (such as CSListMonitors) may keep CSFetchClauses in memory and may thus introduce retain cycles if reference captures are not handled properly. - - @param block - the block to customize the NSFetchRequest - - @result - a CSTweak clause with the NSFetchRequest configuration block - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CORESTORE_OVERLOADABLE CSTweak *_Nonnull CSTweakRequest(void (^_Nonnull block)(NSFetchRequest *_Nonnull fetchRequest)) CORESTORE_RETURNS_RETAINED; @@ -505,61 +186,15 @@ CSTweak *_Nonnull CSTweakRequest(void (^_Nonnull block)(NSFetchRequest *_Nonnull @class CSWhere; -/** - @abstract - Initializes a CSWhere clause with a predicate that always evaluates to the specified boolean value - - @code - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSWhereValue(YES)]]; - @endcode - - @param value - the boolean value for the predicate - - @result - a CSWhere clause with a predicate that always evaluates to the specified boolean value - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSWhere *_Nonnull CSWhereValue(BOOL value) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSWhere clause with a predicate using the specified string format and arguments - - @code - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSWhereFormat(@"%K == %@", @"key", @"value")]]; - @endcode - - @param format - the format string for the predicate, followed by an optional comma-separated argument list - - @result - a CSWhere clause with a predicate using the specified string format and arguments - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSWhere *_Nonnull CSWhereFormat(NSString *_Nonnull format, ...) CORESTORE_RETURNS_RETAINED; -/** - @abstract - Initializes a CSWhere clause with an NSPredicate - - @code - NSPredicate *predicate = // ... - MyPersonEntity *people = [transaction - fetchAllFrom:CSFromClass([MyPersonEntity class]) - fetchClauses:@[CSWherePredicate(predicate)]]; - @endcode - - @param predicate - the NSPredicate for the fetch or query - - @result - a CSWhere clause with an NSPredicate - */ +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_EXTERN CSWhere *_Nonnull CSWherePredicate(NSPredicate *_Nonnull predicate) CORESTORE_RETURNS_RETAINED; diff --git a/Sources/CoreStoreBridge.m b/Sources/CoreStoreBridge.m index 3254b86..52ce1a2 100644 --- a/Sources/CoreStoreBridge.m +++ b/Sources/CoreStoreBridge.m @@ -33,81 +33,79 @@ #pragma mark CSFrom +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass) CORESTORE_RETURNS_RETAINED { - - return [[CSFrom alloc] initWithEntityClass:entityClass]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CORESTORE_RETURNS_RETAINED { - - return [[CSFrom alloc] initWithEntityClass:entityClass configuration:configuration]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CORESTORE_RETURNS_RETAINED { - - return [[CSFrom alloc] initWithEntityClass:entityClass configuration:configuration]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSArray *_Nonnull configurations) CORESTORE_RETURNS_RETAINED { - - return [[CSFrom alloc] initWithEntityClass:entityClass configurations:configurations]; + + abort(); } #pragma mark CSGroupBy +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSGroupBy *_Nonnull CSGroupByKeyPath(NSString *_Nonnull keyPath) CORESTORE_RETURNS_RETAINED { - - return [[CSGroupBy alloc] initWithKeyPath:keyPath]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSGroupBy *_Nonnull CSGroupByKeyPaths(NSString *_Nonnull keyPath, ...) CORESTORE_RETURNS_RETAINED { - - va_list args; - va_start(args, keyPath); - - NSMutableArray *keyPaths = [NSMutableArray new]; - [keyPaths addObject:keyPath]; - - NSString *next; - while ((next = va_arg(args, NSString *)) != nil) { - - [keyPaths addObject:next]; - } - va_end(args); - return [[CSGroupBy alloc] initWithKeyPaths:keyPaths]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSGroupBy *_Nonnull CSGroupByKeyPaths(NSArray *_Nonnull keyPaths) CORESTORE_RETURNS_RETAINED { - - return [[CSGroupBy alloc] initWithKeyPaths:keyPaths]; + + abort(); } #pragma mark CSInto +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass) CORESTORE_RETURNS_RETAINED { - - return [[CSInto alloc] initWithEntityClass:entityClass]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CORESTORE_RETURNS_RETAINED { - - return [[CSInto alloc] initWithEntityClass:entityClass configuration:nil]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CORESTORE_RETURNS_RETAINED { - - return [[CSInto alloc] initWithEntityClass:entityClass configuration:configuration]; + + abort(); } @@ -115,106 +113,104 @@ CSInto *_Nonnull CSIntoClass(Class _Nonnull entityClass, NSString *_Nonnull conf @class CSOrderBy; +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. NSSortDescriptor *_Nonnull CSSortAscending(NSString *_Nonnull key) { - - return [[NSSortDescriptor alloc] initWithKey:key ascending:YES]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. NSSortDescriptor *_Nonnull CSSortDescending(NSString *_Nonnull key) { - - return [[NSSortDescriptor alloc] initWithKey:key ascending:NO]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSOrderBy *_Nonnull CSOrderByKey(NSSortDescriptor *_Nonnull sortDescriptor) CORESTORE_RETURNS_RETAINED { - - return [[CSOrderBy alloc] initWithSortDescriptor:sortDescriptor]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSOrderBy *_Nonnull CSOrderByKeys(NSSortDescriptor *_Nonnull sortDescriptor, ...) CORESTORE_RETURNS_RETAINED { - - va_list args; - va_start(args, sortDescriptor); - - NSMutableArray *sortDescriptors = [NSMutableArray new]; - [sortDescriptors addObject:sortDescriptor]; - - NSSortDescriptor *next; - while ((next = va_arg(args, NSSortDescriptor *)) != nil) { - - [sortDescriptors addObject:next]; - } - va_end(args); - return [[CSOrderBy alloc] initWithSortDescriptors:sortDescriptors]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSOrderBy *_Nonnull CSOrderByKeys(NSArray *_Nonnull sortDescriptors) CORESTORE_RETURNS_RETAINED { - - return [[CSOrderBy alloc] initWithSortDescriptors:sortDescriptors]; + + abort(); } #pragma mark CSSelect +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectNumber(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithNumberTerm:selectTerm]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectDecimal(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithDecimalTerm:selectTerm]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectString(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithStringTerm:selectTerm]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectDate(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithDateTerm:selectTerm]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectData(CSSelectTerm *_Nonnull selectTerm) CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithDataTerm:selectTerm]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSSelect *_Nonnull CSSelectObjectID() CORESTORE_RETURNS_RETAINED { - - return [[CSSelect alloc] initWithObjectIDTerm]; + + abort(); } #pragma mark CSTweak +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CORESTORE_OVERLOADABLE CSTweak *_Nonnull CSTweakRequest(void (^_Nonnull block)(NSFetchRequest *_Nonnull fetchRequest)) CORESTORE_RETURNS_RETAINED { - - return [[CSTweak alloc] initWithBlock:block]; + + abort(); } #pragma mark CSWhere +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSWhere *_Nonnull CSWhereValue(BOOL value) CORESTORE_RETURNS_RETAINED { - - return [[CSWhere alloc] initWithValue:value]; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSWhere *_Nonnull CSWhereFormat(NSString *_Nonnull format, ...) CORESTORE_RETURNS_RETAINED { - - CSWhere *where; - va_list args; - va_start(args, format); - where = [[CSWhere alloc] initWithPredicate:[NSPredicate predicateWithFormat:format arguments:args]]; - va_end(args); - return where; + + abort(); } +NS_UNAVAILABLE // CoreStore Objective-C is now obsoleted in preparation for Swift concurrency. CSWhere *_Nonnull CSWherePredicate(NSPredicate *_Nonnull predicate) CORESTORE_RETURNS_RETAINED { - - return [[CSWhere alloc] initWithPredicate:predicate]; + + abort(); } diff --git a/Sources/CoreStoreBridge.swift b/Sources/CoreStoreBridge.swift index b2c1dfc..13ff99c 100644 --- a/Sources/CoreStoreBridge.swift +++ b/Sources/CoreStoreBridge.swift @@ -28,157 +28,23 @@ import Foundation // MARK: - CoreStoreObjectiveCType -/** - `CoreStoreObjectiveCType`s are Objective-C accessible classes that represent CoreStore's Swift types. - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") public protocol CoreStoreObjectiveCType: AnyObject { - - /** - The corresponding Swift type - */ + associatedtype SwiftType - - /** - The bridged Swift instance - */ + var bridgeToSwift: SwiftType { get } - - /** - Initializes this instance with the Swift instance to bridge from - */ + init(_ swiftValue: SwiftType) } // MARK: - CoreStoreSwiftType -/** - `CoreStoreSwiftType`s are CoreStore's Swift types that are bridgeable to Objective-C. - */ -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") public protocol CoreStoreSwiftType { - - /** - The corresponding Objective-C type - */ + associatedtype ObjectiveCType - /** - The bridged Objective-C instance - */ var bridgeToObjectiveC: ObjectiveCType { get } } - - -// MARK: - Internal - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ closure: () -> T) -> T.ObjectiveCType { - - return closure().bridgeToObjectiveC -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ closure: () -> [T]) -> [T.ObjectiveCType] { - - return closure().map { $0.bridgeToObjectiveC } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ closure: () -> T?) -> T.ObjectiveCType? { - - return closure()?.bridgeToObjectiveC -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ closure: () throws -> T) throws -> T.ObjectiveCType { - - do { - - return try closure().bridgeToObjectiveC - } - catch { - - throw error.bridgeToObjectiveC - } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ closure: () throws -> Void) throws { - - do { - - try closure() - } - catch { - - throw error.bridgeToObjectiveC - } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ error: NSErrorPointer, _ closure: () throws -> T) -> T.ObjectiveCType? { - - do { - - let result = try closure() - error?.pointee = nil - return result.bridgeToObjectiveC - } - catch let swiftError { - - error?.pointee = swiftError.bridgeToObjectiveC - return nil - } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ error: NSErrorPointer, _ closure: () throws -> Void) -> Bool { - - do { - - try closure() - error?.pointee = nil - return true - } - catch let swiftError { - - error?.pointee = swiftError.bridgeToObjectiveC - return false - } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ error: NSErrorPointer, _ closure: () throws -> T?) -> T? { - - do { - - let result = try closure() - error?.pointee = nil - return result - } - catch let swiftError { - - error?.pointee = swiftError.bridgeToObjectiveC - return nil - } -} - -@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.") -internal func bridge(_ error: NSErrorPointer, _ closure: () throws -> [T]) -> [T.ObjectiveCType]? { - - do { - - let result = try closure() - error?.pointee = nil - return result.map { $0.bridgeToObjectiveC } - } - catch let swiftError { - - error?.pointee = swiftError.bridgeToObjectiveC - return nil - } -} - - diff --git a/Sources/CoreStoreError.swift b/Sources/CoreStoreError.swift index c22ce8b..655b5d2 100644 --- a/Sources/CoreStoreError.swift +++ b/Sources/CoreStoreError.swift @@ -258,8 +258,23 @@ public enum CoreStoreError: Error, CustomNSError, Hashable { // MARK: Internal internal init(_ error: Error?) { - - self = error.flatMap({ $0.bridgeToSwift }) ?? .unknown + + guard let error = error else { + + self = .unknown + return + } + switch error { + + case let error as CoreStoreError: + self = error + + case let error as NSError: + self = .internalError(NSError: error) + + default: + self = .unknown + } } } diff --git a/Sources/CustomSchemaMappingProvider.swift b/Sources/CustomSchemaMappingProvider.swift index afcacfa..d8b4525 100644 --- a/Sources/CustomSchemaMappingProvider.swift +++ b/Sources/CustomSchemaMappingProvider.swift @@ -216,7 +216,7 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider { */ public subscript(attribute: KeyPathString) -> Any? { - return self.rawObject.cs_accessValueForKVCKey(attribute) + return self.rawObject.getValue(forKvcKey: attribute) } /** @@ -224,7 +224,7 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider { */ public subscript(attribute: NSAttributeDescription) -> Any? { - return self.rawObject.cs_accessValueForKVCKey(attribute.name) + return self.rawObject.getValue(forKvcKey: attribute.name) } /** @@ -273,8 +273,8 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider { */ public subscript(attribute: KeyPathString) -> Any? { - get { return self.rawObject.cs_accessValueForKVCKey(attribute) } - set { self.rawObject.cs_setValue(newValue, forKVCKey: attribute) } + get { return self.rawObject.getValue(forKvcKey: attribute) } + set { self.rawObject.setValue(newValue, forKvcKey: attribute) } } /** @@ -282,8 +282,8 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider { */ public subscript(attribute: NSAttributeDescription) -> Any? { - get { return self.rawObject.cs_accessValueForKVCKey(attribute.name) } - set { self.rawObject.cs_setValue(newValue, forKVCKey: attribute.name) } + get { return self.rawObject.getValue(forKvcKey: attribute.name) } + set { self.rawObject.setValue(newValue, forKvcKey: attribute.name) } } /** diff --git a/Sources/DataStack+Transaction.swift b/Sources/DataStack+Transaction.swift index 52b3844..ae8bb6c 100644 --- a/Sources/DataStack+Transaction.swift +++ b/Sources/DataStack+Transaction.swift @@ -35,12 +35,18 @@ extension DataStack { Performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the wrapped as `.success(T)` in the `completion`'s `Result`. Any errors thrown from inside the `task` will be reported as `.failure(CoreStoreError)`. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`. - parameter task: the asynchronous closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - parameter completion: the closure executed after the save completes. The `Result` argument of the closure will either wrap the return value of `task`, or any uncaught errors thrown from within `task`. Cancelled `task`s will be indicated by `.failure(error: CoreStoreError.userCancelled)`. Custom errors thrown by the user will be wrapped in `CoreStoreError.userError(error: Error)`. */ - public func perform(asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, completion: @escaping (AsynchronousDataTransaction.Result) -> Void) { + public func perform( + asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, + sourceIdentifier: Any? = nil, + completion: @escaping (AsynchronousDataTransaction.Result) -> Void + ) { self.perform( asynchronous: task, + sourceIdentifier: sourceIdentifier, success: { completion(.success($0)) }, failure: { completion(.failure($0)) } ) @@ -50,14 +56,21 @@ extension DataStack { Performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the argument of the `success` closure. Any errors thrown from inside the `task` will be wrapped in a `CoreStoreError` and reported in the `failure` closure. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`. - parameter task: the asynchronous closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - parameter success: the closure executed after the save succeeds. The `T` argument of the closure will be the value returned from `task`. - parameter failure: the closure executed if the save fails or if any errors are thrown within `task`. Cancelled `task`s will be indicated by `CoreStoreError.userCancelled`. Custom errors thrown by the user will be wrapped in `CoreStoreError.userError(error: Error)`. */ - public func perform(asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, success: @escaping (T) -> Void, failure: @escaping (CoreStoreError) -> Void) { + public func perform( + asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, + sourceIdentifier: Any? = nil, + success: @escaping (T) -> Void, + failure: @escaping (CoreStoreError) -> Void + ) { let transaction = AsynchronousDataTransaction( mainContext: self.rootSavingContext, - queue: self.childTransactionQueue + queue: self.childTransactionQueue, + sourceIdentifier: sourceIdentifier ) transaction.transactionQueue.cs_async { @@ -99,14 +112,20 @@ extension DataStack { - parameter task: the synchronous non-escaping closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`. - parameter waitForAllObservers: When `true`, this method waits for all observers to be notified of the changes before returning. This results in more predictable data update order, but may risk triggering deadlocks. When `false`, this method does not wait for observers to be notified of the changes before returning. This results in lower risk for deadlocks, but the updated data may not have been propagated to the `DataStack` after returning. Defaults to `true`. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - throws: a `CoreStoreError` value indicating the failure. Cancelled `task`s will be indicated by `CoreStoreError.userCancelled`. Custom errors thrown by the user will be wrapped in `CoreStoreError.userError(error: Error)`. - returns: the value returned from `task` */ - public func perform(synchronous task: ((_ transaction: SynchronousDataTransaction) throws -> T), waitForAllObservers: Bool = true) throws -> T { + public func perform( + synchronous task: ((_ transaction: SynchronousDataTransaction) throws -> T), + waitForAllObservers: Bool = true, + sourceIdentifier: Any? = nil + ) throws -> T { let transaction = SynchronousDataTransaction( mainContext: self.rootSavingContext, - queue: self.childTransactionQueue + queue: self.childTransactionQueue, + sourceIdentifier: sourceIdentifier ) return try transaction.transactionQueue.cs_sync { @@ -141,10 +160,14 @@ extension DataStack { /** Begins a non-contiguous transaction where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. + - parameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made. */ - public func beginUnsafe(supportsUndo: Bool = false) -> UnsafeDataTransaction { + public func beginUnsafe( + supportsUndo: Bool = false, + sourceIdentifier: Any? = nil + ) -> UnsafeDataTransaction { return UnsafeDataTransaction( mainContext: self.rootSavingContext, @@ -152,10 +175,11 @@ extension DataStack { Internals.libReverseDomain("UnsafeDataTransaction.queue"), qos: .userInitiated ), - supportsUndo: supportsUndo + supportsUndo: supportsUndo, + sourceIdentifier: sourceIdentifier ) } - + /** Refreshes all registered objects `NSManagedObject`s or `CoreStoreObject`s in the `DataStack`. */ diff --git a/Sources/DataStack.AddStoragePublisher.swift b/Sources/DataStack.AddStoragePublisher.swift index ddc1763..85cf5d5 100644 --- a/Sources/DataStack.AddStoragePublisher.swift +++ b/Sources/DataStack.AddStoragePublisher.swift @@ -199,7 +199,7 @@ extension DataStack { ) if let progress = progress { - progress.cs_setProgressHandler { [weak self] progress in + progress.setProgressHandler { [weak self] progress in guard let self = self, diff --git a/Sources/DiffableDataSource.BaseAdapter.swift b/Sources/DiffableDataSource.BaseAdapter.swift index bf04b22..e3ffb46 100644 --- a/Sources/DiffableDataSource.BaseAdapter.swift +++ b/Sources/DiffableDataSource.BaseAdapter.swift @@ -116,10 +116,10 @@ extension DiffableDataSource { target.reload( using: changeset, animated: animatingDifferences, - setData: setSections + setData: setSections, + completion: completion ) - }, - completion: completion + } ) } @@ -148,10 +148,10 @@ extension DiffableDataSource { target.reload( using: changeset, animated: animatingDifferences, - setData: setSections + setData: setSections, + completion: completion ) - }, - completion: completion + } ) } diff --git a/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift b/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift index d533af4..39fb38a 100644 --- a/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift +++ b/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift @@ -83,7 +83,12 @@ extension DiffableDataSource { - parameter itemProvider: a closure that configures and returns the `NSCollectionViewItem` for the object */ @nonobjc - public init(collectionView: NSCollectionView, dataStack: DataStack, itemProvider: @escaping (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?, supplementaryViewProvider: @escaping (NSCollectionView, String, IndexPath) -> NSView? = { _, _, _ in nil }) { + public init( + collectionView: NSCollectionView, + dataStack: DataStack, + itemProvider: @escaping (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?, + supplementaryViewProvider: @escaping (NSCollectionView, String, IndexPath) -> NSView? = { _, _, _ in nil } + ) { self.itemProvider = itemProvider self.supplementaryViewProvider = supplementaryViewProvider @@ -97,19 +102,27 @@ extension DiffableDataSource { // MARK: - NSCollectionViewDataSource @objc - public dynamic func numberOfSections(in collectionView: NSCollectionView) -> Int { + public dynamic func numberOfSections( + in collectionView: NSCollectionView + ) -> Int { return self.numberOfSections() } @objc - public dynamic func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int { + public dynamic func collectionView( + _ collectionView: NSCollectionView, + numberOfItemsInSection section: Int + ) -> Int { return self.numberOfItems(inSection: section) ?? 0 } @objc - open dynamic func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem { + open dynamic func collectionView( + _ collectionView: NSCollectionView, + itemForRepresentedObjectAt indexPath: IndexPath + ) -> NSCollectionViewItem { guard let objectID = self.itemID(for: indexPath) else { @@ -127,7 +140,11 @@ extension DiffableDataSource { } @objc - open dynamic func collectionView(_ collectionView: NSCollectionView, viewForSupplementaryElementOfKind kind: NSCollectionView.SupplementaryElementKind, at indexPath: IndexPath) -> NSView { + open dynamic func collectionView( + _ collectionView: NSCollectionView, + viewForSupplementaryElementOfKind kind: NSCollectionView.SupplementaryElementKind, + at indexPath: IndexPath + ) -> NSView { guard let view = self.supplementaryViewProvider(collectionView, kind, indexPath) else { @@ -207,9 +224,9 @@ extension DiffableDataSource { self.base?.moveItem(at: indexPath, to: newIndexPath) } - public func performBatchUpdates(updates: () -> Void, animated: Bool) { + public func performBatchUpdates(updates: () -> Void, animated: Bool, completion: @escaping () -> Void) { - self.base?.animator().performBatchUpdates(updates, completionHandler: nil) + self.base?.animator().performBatchUpdates(updates, completionHandler: { _ in completion() }) } public func reloadData() { diff --git a/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift b/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift index 2294f1f..4c22f4e 100644 --- a/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift +++ b/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift @@ -83,7 +83,12 @@ extension DiffableDataSource { - parameter cellProvider: a closure that configures and returns the `UICollectionViewCell` for the object - parameter supplementaryViewProvider: an optional closure for providing `UICollectionReusableView` supplementary views. If not set, defaults to returning `nil` */ - public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, O) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) { + public init( + collectionView: UICollectionView, + dataStack: DataStack, + cellProvider: @escaping (UICollectionView, IndexPath, O) -> UICollectionViewCell?, + supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil } + ) { self.cellProvider = cellProvider self.supplementaryViewProvider = supplementaryViewProvider @@ -97,19 +102,30 @@ extension DiffableDataSource { // MARK: - UICollectionViewDataSource @objc - public dynamic func numberOfSections(in collectionView: UICollectionView) -> Int { + @MainActor + public dynamic func numberOfSections( + in collectionView: UICollectionView + ) -> Int { return self.numberOfSections() } @objc - public dynamic func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + @MainActor + public dynamic func collectionView( + _ collectionView: UICollectionView, + numberOfItemsInSection section: Int + ) -> Int { return self.numberOfItems(inSection: section) ?? 0 } @objc - open dynamic func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + @MainActor + open dynamic func collectionView( + _ collectionView: UICollectionView, + cellForItemAt indexPath: IndexPath + ) -> UICollectionViewCell { guard let objectID = self.itemID(for: indexPath) else { @@ -127,7 +143,12 @@ extension DiffableDataSource { } @objc - open dynamic func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView { + @MainActor + open dynamic func collectionView( + _ collectionView: UICollectionView, + viewForSupplementaryElementOfKind kind: String, + at indexPath: IndexPath + ) -> UICollectionReusableView { guard let view = self.supplementaryViewProvider(collectionView, kind, indexPath) else { @@ -207,9 +228,9 @@ extension DiffableDataSource { self.base?.moveItem(at: indexPath, to: newIndexPath) } - public func performBatchUpdates(updates: () -> Void, animated: Bool) { + public func performBatchUpdates(updates: () -> Void, animated: Bool, completion: @escaping () -> Void) { - self.base?.performBatchUpdates(updates, completion: nil) + self.base?.performBatchUpdates(updates, completion: { _ in completion() }) } public func reloadData() { diff --git a/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift b/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift index 88a6ad9..3747d96 100644 --- a/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift +++ b/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift @@ -82,7 +82,11 @@ extension DiffableDataSource { - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from - parameter cellProvider: a closure that configures and returns the `UITableViewCell` for the object */ - public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, O) -> UITableViewCell?) { + public init( + tableView: UITableView, + dataStack: DataStack, + cellProvider: @escaping (UITableView, IndexPath, O) -> UITableViewCell? + ) { self.cellProvider = cellProvider super.init(target: .init(tableView), dataStack: dataStack) @@ -102,31 +106,48 @@ extension DiffableDataSource { // MARK: - UITableViewDataSource @objc + @MainActor public dynamic func numberOfSections(in tableView: UITableView) -> Int { return self.numberOfSections() } @objc - public dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + @MainActor + public dynamic func tableView( + _ tableView: UITableView, + numberOfRowsInSection section: Int + ) -> Int { return self.numberOfItems(inSection: section) ?? 0 } @objc - open dynamic func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + titleForHeaderInSection section: Int + ) -> String? { return self.sectionID(for: section) } @objc - open dynamic func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + titleForFooterInSection section: Int + ) -> String? { return nil } @objc - open dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + cellForRowAt indexPath: IndexPath + ) -> UITableViewCell { guard let objectID = self.itemID(for: indexPath) else { @@ -144,28 +165,49 @@ extension DiffableDataSource { } @objc - open dynamic func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + canEditRowAt indexPath: IndexPath + ) -> Bool { return true } @objc - open dynamic func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + editingStyleForRowAt indexPath: IndexPath + ) -> UITableViewCell.EditingStyle { return .delete } @objc - open dynamic func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {} + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + commit editingStyle: UITableViewCell.EditingStyle, + forRowAt indexPath: IndexPath + ) {} @objc - open dynamic func sectionIndexTitles(for tableView: UITableView) -> [String]? { + @MainActor + open dynamic func sectionIndexTitles( + for tableView: UITableView + ) -> [String]? { return nil } @objc - open dynamic func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int { + @MainActor + open dynamic func tableView( + _ tableView: UITableView, + sectionForSectionIndexTitle title: String, + at index: Int + ) -> Int { return index } @@ -241,13 +283,13 @@ extension DiffableDataSource { self.base?.moveRow(at: indexPath, to: newIndexPath) } - public func performBatchUpdates(updates: () -> Void, animated: Bool) { + public func performBatchUpdates(updates: () -> Void, animated: Bool, completion: @escaping () -> Void) { guard let base = self.base else { return } - base.performBatchUpdates(updates) + base.performBatchUpdates(updates, completion: { _ in completion() }) } public func reloadData() { diff --git a/Sources/DiffableDataSource.Target.swift b/Sources/DiffableDataSource.Target.swift index 9b1ba16..8408444 100644 --- a/Sources/DiffableDataSource.Target.swift +++ b/Sources/DiffableDataSource.Target.swift @@ -98,7 +98,7 @@ public protocol DiffableDataSourceTarget { /** Animates multiple insert, delete, reload, and move operations as a group. */ - func performBatchUpdates(updates: () -> Void, animated: Bool) + func performBatchUpdates(updates: () -> Void, animated: Bool, completion: @escaping () -> Void) /** Reloads all sections and items. @@ -114,9 +114,15 @@ extension DiffableDataSource.Target { using stagedChangeset: Internals.DiffableDataUIDispatcher.StagedChangeset, animated: Bool, interrupt: ((Internals.DiffableDataUIDispatcher.Changeset) -> Bool)? = nil, - setData: (C) -> Void + setData: (C) -> Void, + completion: @escaping () -> Void ) { + let group = DispatchGroup() + defer { + + group.notify(queue: .main, execute: completion) + } if self.shouldSuspendBatchUpdates, let data = stagedChangeset.last?.data { setData(data) @@ -133,6 +139,7 @@ extension DiffableDataSource.Target { self.reloadData() return } + group.enter() self.performBatchUpdates( updates: { @@ -206,7 +213,8 @@ extension DiffableDataSource.Target { ) } }, - animated: animated + animated: animated, + completion: group.leave ) } } diff --git a/Sources/Internals.Closure.swift b/Sources/Internals.Closure.swift index a7438ec..d904852 100644 --- a/Sources/Internals.Closure.swift +++ b/Sources/Internals.Closure.swift @@ -34,7 +34,10 @@ extension Internals { internal final class Closure { - // MARK: FilePrivate + // MARK: Internal + + internal typealias Arguments = T + internal typealias Result = U internal init(_ closure: @escaping (T) -> U) { diff --git a/Sources/Internals.DiffableDataUIDispatcher.swift b/Sources/Internals.DiffableDataUIDispatcher.swift index a09202c..acde1bf 100644 --- a/Sources/Internals.DiffableDataUIDispatcher.swift +++ b/Sources/Internals.DiffableDataUIDispatcher.swift @@ -59,16 +59,14 @@ extension Internals { Target, StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>, @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void - ) -> Void, - completion: @escaping () -> Void + ) -> Void ) { self.apply( .init(), target: target, animatingDifferences: animatingDifferences, - performUpdates: performUpdates, - completion: completion + performUpdates: performUpdates ) } @@ -80,8 +78,7 @@ extension Internals { Target, StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>, @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void - ) -> Void, - completion: @escaping () -> Void + ) -> Void ) { self.dispatcher.dispatch { [weak self] in @@ -112,7 +109,6 @@ extension Internals { #if canImport(QuartzCore) CATransaction.begin() - CATransaction.setCompletionBlock(completion) if !animatingDifferences { @@ -122,11 +118,9 @@ extension Internals { CATransaction.commit() - #else performDiffingUpdates() - completion() #endif diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift index 760be1a..c8d6375 100644 --- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift +++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift @@ -43,7 +43,10 @@ internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject { var sectionIndexTransformer: (_ sectionName: KeyPathString?) -> String? { get } - func controller(_ controller: NSFetchedResultsController, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot) + func controller( + _ controller: NSFetchedResultsController, + didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot + ) } diff --git a/Sources/Internals.FetchedResultsControllerDelegate.swift b/Sources/Internals.FetchedResultsControllerDelegate.swift index 2931ee0..15da8a7 100644 --- a/Sources/Internals.FetchedResultsControllerDelegate.swift +++ b/Sources/Internals.FetchedResultsControllerDelegate.swift @@ -33,13 +33,28 @@ internal protocol FetchedResultsControllerHandler: AnyObject { var sectionIndexTransformer: (_ sectionName: KeyPathString?) -> String? { get } - func controller(_ controller: NSFetchedResultsController, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) + func controller( + _ controller: NSFetchedResultsController, + didChangeObject anObject: Any, + atIndexPath indexPath: IndexPath?, + forChangeType type: NSFetchedResultsChangeType, + newIndexPath: IndexPath? + ) - func controller(_ controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) + func controller( + _ controller: NSFetchedResultsController, + didChangeSection sectionInfo: NSFetchedResultsSectionInfo, + atIndex sectionIndex: Int, + forChangeType type: NSFetchedResultsChangeType + ) - func controllerWillChangeContent(_ controller: NSFetchedResultsController) + func controllerWillChangeContent( + _ controller: NSFetchedResultsController + ) - func controllerDidChangeContent(_ controller: NSFetchedResultsController) + func controllerDidChangeContent( + _ controller: NSFetchedResultsController + ) } @@ -102,7 +117,6 @@ extension Internals { return } - self.handler?.controllerDidChangeContent(controller) } diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift index 79e0789..4487704 100644 --- a/Sources/ListMonitor.swift +++ b/Sources/ListMonitor.swift @@ -393,19 +393,31 @@ public final class ListMonitor: Hashable { observer, willChange: { (observer, monitor) in - observer.listMonitorWillChange(monitor) + observer.listMonitorWillChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didChange: { (observer, monitor) in - observer.listMonitorDidChange(monitor) + observer.listMonitorDidChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, willRefetch: { (observer, monitor) in - observer.listMonitorWillRefetch(monitor) + observer.listMonitorWillRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didRefetch: { (observer, monitor) in - observer.listMonitorDidRefetch(monitor) + observer.listMonitorDidRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) } @@ -428,38 +440,71 @@ public final class ListMonitor: Hashable { observer, willChange: { (observer, monitor) in - observer.listMonitorWillChange(monitor) + observer.listMonitorWillChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didChange: { (observer, monitor) in - observer.listMonitorDidChange(monitor) + observer.listMonitorDidChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, willRefetch: { (observer, monitor) in - observer.listMonitorWillRefetch(monitor) + observer.listMonitorWillRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didRefetch: { (observer, monitor) in - observer.listMonitorDidRefetch(monitor) + observer.listMonitorDidRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) self.registerObserver( observer, didInsertObject: { (observer, monitor, object, toIndexPath) in - observer.listMonitor(monitor, didInsertObject: object, toIndexPath: toIndexPath) + observer.listMonitor( + monitor, + didInsertObject: object, + toIndexPath: toIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didDeleteObject: { (observer, monitor, object, fromIndexPath) in - observer.listMonitor(monitor, didDeleteObject: object, fromIndexPath: fromIndexPath) + observer.listMonitor( + monitor, + didDeleteObject: object, + fromIndexPath: fromIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didUpdateObject: { (observer, monitor, object, atIndexPath) in - observer.listMonitor(monitor, didUpdateObject: object, atIndexPath: atIndexPath) + observer.listMonitor( + monitor, + didUpdateObject: object, + atIndexPath: atIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didMoveObject: { (observer, monitor, object, fromIndexPath, toIndexPath) in - observer.listMonitor(monitor, didMoveObject: object, fromIndexPath: fromIndexPath, toIndexPath: toIndexPath) + observer.listMonitor( + monitor, + didMoveObject: object, + fromIndexPath: fromIndexPath, + toIndexPath: toIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) } @@ -482,49 +527,92 @@ public final class ListMonitor: Hashable { observer, willChange: { (observer, monitor) in - observer.listMonitorWillChange(monitor) + observer.listMonitorWillChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didChange: { (observer, monitor) in - observer.listMonitorDidChange(monitor) + observer.listMonitorDidChange( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, willRefetch: { (observer, monitor) in - observer.listMonitorWillRefetch(monitor) + observer.listMonitorWillRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didRefetch: { (observer, monitor) in - observer.listMonitorDidRefetch(monitor) + observer.listMonitorDidRefetch( + monitor, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) self.registerObserver( observer, didInsertObject: { (observer, monitor, object, toIndexPath) in - observer.listMonitor(monitor, didInsertObject: object, toIndexPath: toIndexPath) + observer.listMonitor( + monitor, + didInsertObject: object, + toIndexPath: toIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didDeleteObject: { (observer, monitor, object, fromIndexPath) in - observer.listMonitor(monitor, didDeleteObject: object, fromIndexPath: fromIndexPath) + observer.listMonitor( + monitor, + didDeleteObject: object, + fromIndexPath: fromIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didUpdateObject: { (observer, monitor, object, atIndexPath) in - observer.listMonitor(monitor, didUpdateObject: object, atIndexPath: atIndexPath) + observer.listMonitor( + monitor, + didUpdateObject: object, + atIndexPath: atIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didMoveObject: { (observer, monitor, object, fromIndexPath, toIndexPath) in - observer.listMonitor(monitor, didMoveObject: object, fromIndexPath: fromIndexPath, toIndexPath: toIndexPath) + observer.listMonitor( + monitor, + didMoveObject: object, + fromIndexPath: fromIndexPath, + toIndexPath: toIndexPath, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) self.registerObserver( observer, didInsertSection: { (observer, monitor, sectionInfo, toIndex) in - observer.listMonitor(monitor, didInsertSection: sectionInfo, toSectionIndex: toIndex) + observer.listMonitor( + monitor, + didInsertSection: sectionInfo, + toSectionIndex: toIndex, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) }, didDeleteSection: { (observer, monitor, sectionInfo, fromIndex) in - observer.listMonitor(monitor, didDeleteSection: sectionInfo, fromSectionIndex: fromIndex) + observer.listMonitor( + monitor, + didDeleteSection: sectionInfo, + fromSectionIndex: fromIndex, + sourceIdentifier: monitor.fetchedResultsController.managedObjectContext.saveMetadata?.sourceIdentifier + ) } ) } @@ -555,11 +643,18 @@ public final class ListMonitor: Hashable { `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes. - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`. */ - public func refetch(_ fetchClauses: FetchClause...) { + public func refetch( + _ fetchClauses: FetchClause..., + sourceIdentifier: Any? = nil + ) { - self.refetch(fetchClauses) + self.refetch( + fetchClauses, + sourceIdentifier: sourceIdentifier + ) } /** @@ -568,14 +663,21 @@ public final class ListMonitor: Hashable { `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes. - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`. */ - public func refetch(_ fetchClauses: [FetchClause]) { + public func refetch( + _ fetchClauses: [FetchClause], + sourceIdentifier: Any? = nil + ) { - self.refetch { (fetchRequest) in - - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } + self.refetch( + { (fetchRequest) in + + fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } + }, + sourceIdentifier: sourceIdentifier + ) } @@ -627,7 +729,12 @@ public final class ListMonitor: Hashable { // MARK: Internal - internal convenience init(dataStack: DataStack, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) { + internal convenience init( + dataStack: DataStack, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) { self.init( context: dataStack.mainContext, @@ -639,7 +746,13 @@ public final class ListMonitor: Hashable { ) } - internal convenience init(dataStack: DataStack, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: @escaping (ListMonitor) -> Void) { + internal convenience init( + dataStack: DataStack, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: @escaping (ListMonitor) -> Void + ) { self.init( context: dataStack.mainContext, @@ -651,7 +764,12 @@ public final class ListMonitor: Hashable { ) } - internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) { + internal convenience init( + unsafeTransaction: UnsafeDataTransaction, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) { self.init( context: unsafeTransaction.context, @@ -663,7 +781,13 @@ public final class ListMonitor: Hashable { ) } - internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: @escaping (ListMonitor) -> Void) { + internal convenience init( + unsafeTransaction: UnsafeDataTransaction, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: @escaping (ListMonitor) -> Void + ) { self.init( context: unsafeTransaction.context, @@ -675,7 +799,12 @@ public final class ListMonitor: Hashable { ) } - internal func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor) -> Void) { + internal func registerChangeNotification( + _ notificationKey: UnsafeRawPointer, + name: Notification.Name, + toObserver observer: AnyObject, + callback: @escaping (_ monitor: ListMonitor) -> Void + ) { Internals.setAssociatedRetainedObject( Internals.NotificationObserver( @@ -695,7 +824,16 @@ public final class ListMonitor: Hashable { ) } - internal func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor, _ object: O, _ indexPath: IndexPath?, _ newIndexPath: IndexPath?) -> Void) { + internal func registerObjectNotification( + _ notificationKey: UnsafeRawPointer, + name: Notification.Name, + toObserver observer: AnyObject, + callback: @escaping ( + _ monitor: ListMonitor, + _ object: O, + _ indexPath: IndexPath?, + _ newIndexPath: IndexPath? + ) -> Void) { Internals.setAssociatedRetainedObject( Internals.NotificationObserver( @@ -722,7 +860,16 @@ public final class ListMonitor: Hashable { ) } - internal func registerSectionNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor, _ sectionInfo: NSFetchedResultsSectionInfo, _ sectionIndex: Int) -> Void) { + internal func registerSectionNotification( + _ notificationKey: UnsafeRawPointer, + name: Notification.Name, + toObserver observer: AnyObject, + callback: @escaping ( + _ monitor: ListMonitor, + _ sectionInfo: NSFetchedResultsSectionInfo, + _ sectionIndex: Int + ) -> Void + ) { Internals.setAssociatedRetainedObject( Internals.NotificationObserver( @@ -745,7 +892,24 @@ public final class ListMonitor: Hashable { ) } - internal func registerObserver(_ observer: U, willChange: @escaping (_ observer: U, _ monitor: ListMonitor) -> Void, didChange: @escaping (_ observer: U, _ monitor: ListMonitor) -> Void, willRefetch: @escaping (_ observer: U, _ monitor: ListMonitor) -> Void, didRefetch: @escaping (_ observer: U, _ monitor: ListMonitor) -> Void) { + internal func registerObserver( + _ observer: U, + willChange: @escaping ( + _ observer: U, + _ monitor: ListMonitor + ) -> Void, + didChange: @escaping ( + _ observer: U, + _ monitor: ListMonitor + ) -> Void, + willRefetch: @escaping ( + _ observer: U, + _ monitor: ListMonitor + ) -> Void, + didRefetch: @escaping ( + _ observer: U, + _ monitor: ListMonitor + ) -> Void) { Internals.assert( Thread.isMainThread, @@ -805,7 +969,33 @@ public final class ListMonitor: Hashable { ) } - internal func registerObserver(_ observer: U, didInsertObject: @escaping (_ observer: U, _ monitor: ListMonitor, _ object: O, _ toIndexPath: IndexPath) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ListMonitor, _ object: O, _ fromIndexPath: IndexPath) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ListMonitor, _ object: O, _ atIndexPath: IndexPath) -> Void, didMoveObject: @escaping (_ observer: U, _ monitor: ListMonitor, _ object: O, _ fromIndexPath: IndexPath, _ toIndexPath: IndexPath) -> Void) { + internal func registerObserver( + _ observer: U, + didInsertObject: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ object: O, + _ toIndexPath: IndexPath + ) -> Void, + didDeleteObject: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ object: O, + _ fromIndexPath: IndexPath + ) -> Void, + didUpdateObject: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ object: O, + _ atIndexPath: IndexPath + ) -> Void, + didMoveObject: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ object: O, + _ fromIndexPath: IndexPath, + _ toIndexPath: IndexPath + ) -> Void) { Internals.assert( Thread.isMainThread, @@ -866,7 +1056,20 @@ public final class ListMonitor: Hashable { ) } - internal func registerObserver(_ observer: U, didInsertSection: @escaping (_ observer: U, _ monitor: ListMonitor, _ sectionInfo: NSFetchedResultsSectionInfo, _ toIndex: Int) -> Void, didDeleteSection: @escaping (_ observer: U, _ monitor: ListMonitor, _ sectionInfo: NSFetchedResultsSectionInfo, _ fromIndex: Int) -> Void) { + internal func registerObserver( + _ observer: U, + didInsertSection: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ sectionInfo: NSFetchedResultsSectionInfo, + _ toIndex: Int + ) -> Void, + didDeleteSection: @escaping ( + _ observer: U, + _ monitor: ListMonitor, + _ sectionInfo: NSFetchedResultsSectionInfo, + _ fromIndex: Int + ) -> Void) { Internals.assert( Thread.isMainThread, @@ -922,7 +1125,10 @@ public final class ListMonitor: Hashable { Internals.setAssociatedRetainedObject(nilValue, forKey: &self.didDeleteSectionKey, inObject: observer) } - internal func refetch(_ applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) { + internal func refetch( + _ applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + sourceIdentifier: Any? + ) { Internals.assert( Thread.isMainThread, @@ -987,10 +1193,15 @@ public final class ListMonitor: Hashable { self.isPendingRefetch = false + newFetchedResultsController.managedObjectContext.saveMetadata = .init( + isSavingSynchronously: false, + sourceIdentifier: sourceIdentifier + ) NotificationCenter.default.post( name: Notification.Name.listMonitorDidRefetchList, object: self ) + newFetchedResultsController.managedObjectContext.saveMetadata = nil } } } @@ -1051,7 +1262,15 @@ public final class ListMonitor: Hashable { } } - private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedResultsControllerDelegate) { + private static func recreateFetchedResultsController( + context: NSManagedObjectContext, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) -> ( + controller: Internals.CoreStoreFetchedResultsController, + delegate: Internals.FetchedResultsControllerDelegate + ) { let fetchRequest = Internals.CoreStoreFetchRequest() fetchRequest.fetchLimit = 0 @@ -1077,7 +1296,14 @@ public final class ListMonitor: Hashable { private let from: From private let sectionBy: SectionBy? - private init(context: NSManagedObjectContext, transactionQueue: DispatchQueue, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: ((ListMonitor) -> Void)?) { + private init( + context: NSManagedObjectContext, + transactionQueue: DispatchQueue, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: ((ListMonitor) -> Void)? + ) { self.isSectioned = (sectionBy != nil) self.from = from @@ -1124,7 +1350,7 @@ public final class ListMonitor: Hashable { return } - self.refetch(self.applyFetchClauses) + self.refetch(self.applyFetchClauses, sourceIdentifier: nil) } ) @@ -1148,7 +1374,7 @@ public final class ListMonitor: Hashable { if previousStores != currentStores { - self.refetch(self.applyFetchClauses) + self.refetch(self.applyFetchClauses, sourceIdentifier: nil) } } @@ -1294,7 +1520,13 @@ extension ListMonitor: FetchedResultsControllerHandler { return self.sectionByIndexTransformer } - internal func controller(_ controller: NSFetchedResultsController, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) { + internal func controller( + _ controller: NSFetchedResultsController, + didChangeObject anObject: Any, + atIndexPath indexPath: IndexPath?, + forChangeType type: NSFetchedResultsChangeType, + newIndexPath: IndexPath? + ) { switch type { @@ -1344,7 +1576,12 @@ extension ListMonitor: FetchedResultsControllerHandler { } } - internal func controller(_ controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) { + internal func controller( + _ controller: NSFetchedResultsController, + didChangeSection sectionInfo: NSFetchedResultsSectionInfo, + atIndex sectionIndex: Int, + forChangeType type: NSFetchedResultsChangeType + ) { switch type { @@ -1373,7 +1610,9 @@ extension ListMonitor: FetchedResultsControllerHandler { } } - internal func controllerWillChangeContent(_ controller: NSFetchedResultsController) { + internal func controllerWillChangeContent( + _ controller: NSFetchedResultsController + ) { self.taskGroup.enter() NotificationCenter.default.post( @@ -1382,7 +1621,9 @@ extension ListMonitor: FetchedResultsControllerHandler { ) } - internal func controllerDidChangeContent(_ controller: NSFetchedResultsController) { + internal func controllerDidChangeContent( + _ controller: NSFetchedResultsController + ) { defer { diff --git a/Sources/ListObserver.swift b/Sources/ListObserver.swift index ff6f256..30940b1 100644 --- a/Sources/ListObserver.swift +++ b/Sources/ListObserver.swift @@ -51,15 +51,54 @@ public protocol ListObserver: AnyObject { The default implementation does nothing. - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source */ - func listMonitorWillChange(_ monitor: ListMonitor) + func listMonitorWillChange( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) + + /** + Handles processing just before a change to the observed list occurs. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + */ + func listMonitorWillChange( + _ monitor: ListMonitor + ) + + /** + Handles processing right after a change to the observed list occurs. (Required) + + - parameter monitor: the `ListMonitor` monitoring the object being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitorDidChange( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) /** Handles processing right after a change to the observed list occurs. (Required) - parameter monitor: the `ListMonitor` monitoring the object being observed */ - func listMonitorDidChange(_ monitor: ListMonitor) + func listMonitorDidChange( + _ monitor: ListMonitor + ) + + /** + This method is broadcast from within the `ListMonitor`'s `refetch(...)` method to let observers prepare for the internal `NSFetchedResultsController`'s pending change to its predicate, sort descriptors, etc. (Optional) + + - Important: All `ListMonitor` access between `listMonitorWillRefetch(_:)` and `listMonitorDidRefetch(_:)` will raise and assertion. The actual refetch will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes. + - parameter monitor: the `ListMonitor` monitoring the object being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitorWillRefetch( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) /** This method is broadcast from within the `ListMonitor`'s `refetch(...)` method to let observers prepare for the internal `NSFetchedResultsController`'s pending change to its predicate, sort descriptors, etc. (Optional) @@ -67,7 +106,21 @@ public protocol ListObserver: AnyObject { - Important: All `ListMonitor` access between `listMonitorWillRefetch(_:)` and `listMonitorDidRefetch(_:)` will raise and assertion. The actual refetch will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes. - parameter monitor: the `ListMonitor` monitoring the object being observed */ - func listMonitorWillRefetch(_ monitor: ListMonitor) + func listMonitorWillRefetch( + _ monitor: ListMonitor + ) + + /** + After the `ListMonitor`'s `refetch(...)` method is called, this method is broadcast after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes. (Required) + + - Important: When `listMonitorDidRefetch(_:)` is called it should be assumed that all `ListMonitor`'s previous data have been reset, including counts, objects, and persistent stores. + - parameter monitor: the `ListMonitor` monitoring the object being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitorDidRefetch( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) /** After the `ListMonitor`'s `refetch(...)` method is called, this method is broadcast after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes. (Required) @@ -75,7 +128,9 @@ public protocol ListObserver: AnyObject { - Important: When `listMonitorDidRefetch(_:)` is called it should be assumed that all `ListMonitor`'s previous data have been reset, including counts, objects, and persistent stores. - parameter monitor: the `ListMonitor` monitoring the object being observed */ - func listMonitorDidRefetch(_ monitor: ListMonitor) + func listMonitorDidRefetch( + _ monitor: ListMonitor + ) } @@ -83,9 +138,45 @@ public protocol ListObserver: AnyObject { extension ListObserver { - public func listMonitorWillChange(_ monitor: ListMonitor) { } + public func listMonitorWillChange( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) { + + self.listMonitorWillChange(monitor) + } - public func listMonitorWillRefetch(_ monitor: ListMonitor) { } + public func listMonitorWillChange( + _ monitor: ListMonitor + ) {} + + public func listMonitorDidChange( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) { + + self.listMonitorDidChange(monitor) + } + + public func listMonitorWillRefetch( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) { + + self.listMonitorWillRefetch(monitor) + } + + public func listMonitorWillRefetch( + _ monitor: ListMonitor + ) {} + + public func listMonitorDidRefetch( + _ monitor: ListMonitor, + sourceIdentifier: Any? + ) { + + self.listMonitorDidRefetch(monitor) + } } @@ -110,8 +201,44 @@ public protocol ListObjectObserver: ListObserver { - parameter monitor: the `ListMonitor` monitoring the list being observed - parameter object: the entity type for the inserted object - parameter indexPath: the new `NSIndexPath` for the inserted object + - parameter sourceIdentifier: an optional identifier provided by the transaction source */ - func listMonitor(_ monitor: ListMonitor, didInsertObject object: ListEntityType, toIndexPath indexPath: IndexPath) + func listMonitor( + _ monitor: ListMonitor, + didInsertObject object: ListEntityType, + toIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) + + /** + Notifies that an object was inserted to the specified `NSIndexPath` in the list. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter object: the entity type for the inserted object + - parameter indexPath: the new `NSIndexPath` for the inserted object + */ + func listMonitor( + _ monitor: ListMonitor, + didInsertObject object: ListEntityType, + toIndexPath indexPath: IndexPath + ) + + /** + Notifies that an object was deleted from the specified `NSIndexPath` in the list. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter object: the entity type for the deleted object + - parameter indexPath: the `NSIndexPath` for the deleted object + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitor( + _ monitor: ListMonitor, + didDeleteObject object: ListEntityType, + fromIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) /** Notifies that an object was deleted from the specified `NSIndexPath` in the list. (Optional) @@ -121,7 +248,27 @@ public protocol ListObjectObserver: ListObserver { - parameter object: the entity type for the deleted object - parameter indexPath: the `NSIndexPath` for the deleted object */ - func listMonitor(_ monitor: ListMonitor, didDeleteObject object: ListEntityType, fromIndexPath indexPath: IndexPath) + func listMonitor( + _ monitor: ListMonitor, + didDeleteObject object: ListEntityType, + fromIndexPath indexPath: IndexPath + ) + + /** + Notifies that an object at the specified `NSIndexPath` was updated. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter object: the entity type for the updated object + - parameter indexPath: the `NSIndexPath` for the updated object + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitor( + _ monitor: ListMonitor, + didUpdateObject object: ListEntityType, + atIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) /** Notifies that an object at the specified `NSIndexPath` was updated. (Optional) @@ -131,7 +278,29 @@ public protocol ListObjectObserver: ListObserver { - parameter object: the entity type for the updated object - parameter indexPath: the `NSIndexPath` for the updated object */ - func listMonitor(_ monitor: ListMonitor, didUpdateObject object: ListEntityType, atIndexPath indexPath: IndexPath) + func listMonitor( + _ monitor: ListMonitor, + didUpdateObject object: ListEntityType, + atIndexPath indexPath: IndexPath + ) + + /** + Notifies that an object's index changed. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter object: the entity type for the moved object + - parameter fromIndexPath: the previous `NSIndexPath` for the moved object + - parameter toIndexPath: the new `NSIndexPath` for the moved object + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitor( + _ monitor: ListMonitor, + didMoveObject object: ListEntityType, + fromIndexPath: IndexPath, + toIndexPath: IndexPath, + sourceIdentifier: Any? + ) /** Notifies that an object's index changed. (Optional) @@ -142,7 +311,12 @@ public protocol ListObjectObserver: ListObserver { - parameter fromIndexPath: the previous `NSIndexPath` for the moved object - parameter toIndexPath: the new `NSIndexPath` for the moved object */ - func listMonitor(_ monitor: ListMonitor, didMoveObject object: ListEntityType, fromIndexPath: IndexPath, toIndexPath: IndexPath) + func listMonitor( + _ monitor: ListMonitor, + didMoveObject object: ListEntityType, + fromIndexPath: IndexPath, + toIndexPath: IndexPath + ) } @@ -150,13 +324,88 @@ public protocol ListObjectObserver: ListObserver { extension ListObjectObserver { - public func listMonitor(_ monitor: ListMonitor, didInsertObject object: ListEntityType, toIndexPath indexPath: IndexPath) { } + public func listMonitor( + _ monitor: ListMonitor, + didInsertObject object: ListEntityType, + toIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didInsertObject: object, + toIndexPath: indexPath + ) + } - public func listMonitor(_ monitor: ListMonitor, didDeleteObject object: ListEntityType, fromIndexPath indexPath: IndexPath) { } + public func listMonitor( + _ monitor: ListMonitor, + didInsertObject object: ListEntityType, + toIndexPath indexPath: IndexPath + ) {} - public func listMonitor(_ monitor: ListMonitor, didUpdateObject object: ListEntityType, atIndexPath indexPath: IndexPath) { } + public func listMonitor( + _ monitor: ListMonitor, + didDeleteObject object: ListEntityType, + fromIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didDeleteObject: object, + fromIndexPath: indexPath + ) + } - public func listMonitor(_ monitor: ListMonitor, didMoveObject object: ListEntityType, fromIndexPath: IndexPath, toIndexPath: IndexPath) { } + public func listMonitor( + _ monitor: ListMonitor, + didDeleteObject object: ListEntityType, + fromIndexPath indexPath: IndexPath + ) {} + + public func listMonitor( + _ monitor: ListMonitor, + didUpdateObject object: ListEntityType, + atIndexPath indexPath: IndexPath, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didUpdateObject: object, + atIndexPath: indexPath + ) + } + + public func listMonitor( + _ monitor: ListMonitor, + didUpdateObject object: ListEntityType, + atIndexPath indexPath: IndexPath + ) {} + + public func listMonitor( + _ monitor: ListMonitor, + didMoveObject object: ListEntityType, + fromIndexPath: IndexPath, + toIndexPath: IndexPath, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didMoveObject: object, + fromIndexPath: fromIndexPath, + toIndexPath: toIndexPath + ) + } + + public func listMonitor( + _ monitor: ListMonitor, + didMoveObject object: ListEntityType, + fromIndexPath: IndexPath, + toIndexPath: IndexPath + ) {} } @@ -182,8 +431,44 @@ public protocol ListSectionObserver: ListObjectObserver { - parameter monitor: the `ListMonitor` monitoring the list being observed - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section - parameter sectionIndex: the new section index for the new section + - parameter sourceIdentifier: an optional identifier provided by the transaction source */ - func listMonitor(_ monitor: ListMonitor, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) + func listMonitor( + _ monitor: ListMonitor, + didInsertSection sectionInfo: NSFetchedResultsSectionInfo, + toSectionIndex sectionIndex: Int, + sourceIdentifier: Any? + ) + + /** + Notifies that a section was inserted at the specified index. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section + - parameter sectionIndex: the new section index for the new section + */ + func listMonitor( + _ monitor: ListMonitor, + didInsertSection sectionInfo: NSFetchedResultsSectionInfo, + toSectionIndex sectionIndex: Int + ) + + /** + Notifies that a section was inserted at the specified index. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ListMonitor` monitoring the list being observed + - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section + - parameter sectionIndex: the previous section index for the deleted section + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func listMonitor( + _ monitor: ListMonitor, + didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, + fromSectionIndex sectionIndex: Int, + sourceIdentifier: Any? + ) /** Notifies that a section was inserted at the specified index. (Optional) @@ -193,7 +478,11 @@ public protocol ListSectionObserver: ListObjectObserver { - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section - parameter sectionIndex: the previous section index for the deleted section */ - func listMonitor(_ monitor: ListMonitor, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) + func listMonitor( + _ monitor: ListMonitor, + didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, + fromSectionIndex sectionIndex: Int + ) } @@ -201,7 +490,43 @@ public protocol ListSectionObserver: ListObjectObserver { extension ListSectionObserver { - public func listMonitor(_ monitor: ListMonitor, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) { } + public func listMonitor( + _ monitor: ListMonitor, + didInsertSection sectionInfo: NSFetchedResultsSectionInfo, + toSectionIndex sectionIndex: Int, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didInsertSection: sectionInfo, + toSectionIndex: sectionIndex + ) + } - public func listMonitor(_ monitor: ListMonitor, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) { } + public func listMonitor( + _ monitor: ListMonitor, + didInsertSection sectionInfo: NSFetchedResultsSectionInfo, + toSectionIndex sectionIndex: Int + ) {} + + public func listMonitor( + _ monitor: ListMonitor, + didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, + fromSectionIndex sectionIndex: Int, + sourceIdentifier: Any? + ) { + + self.listMonitor( + monitor, + didDeleteSection: sectionInfo, + fromSectionIndex: sectionIndex + ) + } + + public func listMonitor( + _ monitor: ListMonitor, + didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, + fromSectionIndex sectionIndex: Int + ) {} } diff --git a/Sources/ListPublisher.swift b/Sources/ListPublisher.swift index 9a35e4f..4fedd23 100644 --- a/Sources/ListPublisher.swift +++ b/Sources/ListPublisher.swift @@ -76,13 +76,7 @@ public final class ListPublisher: Hashable { /** A snapshot of the latest state of this list */ - public fileprivate(set) var snapshot: ListSnapshot = .init() { - - didSet { - - self.notifyObservers() - } - } + public private(set) var snapshot: ListSnapshot = .init() // MARK: Public (Observers) @@ -111,7 +105,7 @@ public final class ListPublisher: Hashable { "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread." ) self.observers.setObject( - Internals.Closure(callback), + Internals.Closure({ callback($0.listPublisher) }), forKey: observer ) if notifyInitial { @@ -119,6 +113,44 @@ public final class ListPublisher: Hashable { callback(self) } } + + /** + Registers an object as an observer to be notified when changes to the `ListPublisher`'s snapshot occur. + + To prevent retain-cycles, `ListPublisher` only keeps `weak` references to its observers. + + For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. + + Calling `addObserver(_:_:)` multiple times on the same observer is safe. + + - parameter observer: an object to become owner of the specified `callback` + - parameter notifyInitial: if `true`, the callback is executed immediately with the current publisher state. Otherwise only succeeding updates will notify the observer. Default value is `false`. + - parameter initialSourceIdentifier: an optional value that identifies the initial callback invocation if `notifyInitial` is `true`. + - parameter callback: the closure to execute when changes occur + */ + public func addObserver( + _ observer: T, + notifyInitial: Bool = false, + initialSourceIdentifier: Any? = nil, + _ callback: @escaping ( + _ listPublisher: ListPublisher, + _ sourceIdentifier: Any? + ) -> Void + ) { + + Internals.assert( + Thread.isMainThread, + "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread." + ) + self.observers.setObject( + Internals.Closure(callback), + forKey: observer + ) + if notifyInitial { + + callback(self, initialSourceIdentifier) + } + } /** Unregisters an object from receiving notifications for changes to the `ListPublisher`'s snapshot. @@ -149,8 +181,12 @@ public final class ListPublisher: Hashable { ) ``` - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. */ - public func refetch(_ clauseChain: B) throws where B.ObjectType == O { + public func refetch( + _ clauseChain: B, + sourceIdentifier: Any? = nil + ) throws where B.ObjectType == O { try self.refetch( from: clauseChain.from, @@ -158,7 +194,8 @@ public final class ListPublisher: Hashable { applyFetchClauses: { (fetchRequest) in clauseChain.fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } + }, + sourceIdentifier: sourceIdentifier ) } @@ -173,8 +210,12 @@ public final class ListPublisher: Hashable { ) ``` - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. */ - public func refetch(_ clauseChain: B) throws where B.ObjectType == O { + public func refetch( + _ clauseChain: B, + sourceIdentifier: Any? = nil + ) throws where B.ObjectType == O { try self.refetch( from: clauseChain.from, @@ -182,7 +223,8 @@ public final class ListPublisher: Hashable { applyFetchClauses: { (fetchRequest) in clauseChain.fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - } + }, + sourceIdentifier: sourceIdentifier ) } @@ -230,7 +272,12 @@ public final class ListPublisher: Hashable { internal private(set) lazy var context: NSManagedObjectContext = self.fetchedResultsController.managedObjectContext - internal convenience init(dataStack: DataStack, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) { + internal convenience init( + dataStack: DataStack, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) { self.init( context: dataStack.mainContext, @@ -241,7 +288,13 @@ public final class ListPublisher: Hashable { ) } - internal convenience init(dataStack: DataStack, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: @escaping (ListPublisher) -> Void) { + internal convenience init( + dataStack: DataStack, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: @escaping (ListPublisher) -> Void + ) { self.init( context: dataStack.mainContext, @@ -252,7 +305,12 @@ public final class ListPublisher: Hashable { ) } - internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) { + internal convenience init( + unsafeTransaction: UnsafeDataTransaction, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) { self.init( context: unsafeTransaction.context, @@ -263,7 +321,13 @@ public final class ListPublisher: Hashable { ) } - internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: @escaping (ListPublisher) -> Void) { + internal convenience init( + unsafeTransaction: UnsafeDataTransaction, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: @escaping (ListPublisher) -> Void + ) { self.init( context: unsafeTransaction.context, @@ -274,7 +338,12 @@ public final class ListPublisher: Hashable { ) } - internal func refetch(from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) throws { + internal func refetch( + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + sourceIdentifier: Any? + ) throws { let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController( context: self.fetchedResultsController.managedObjectContext, @@ -291,7 +360,13 @@ public final class ListPublisher: Hashable { (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = (newFetchedResultsController, newFetchedResultsControllerDelegate) newFetchedResultsControllerDelegate.handler = self + + newFetchedResultsController.managedObjectContext.saveMetadata = .init( + isSavingSynchronously: true, + sourceIdentifier: sourceIdentifier + ) try newFetchedResultsController.performFetchFromSpecifiedStores() + newFetchedResultsController.managedObjectContext.saveMetadata = nil } deinit { @@ -301,6 +376,20 @@ public final class ListPublisher: Hashable { } + // MARK: FilePrivate + + fileprivate typealias ObserverClosureType = Internals.Closure<(listPublisher: ListPublisher, sourceIdentifier: Any?), Void> + + fileprivate func set( + snapshot: ListSnapshot, + sourceIdentifier: Any? + ) { + + self.snapshot = snapshot + self.notifyObservers(sourceIdentifier: sourceIdentifier) + } + + // MARK: Private private var query: ( @@ -315,9 +404,17 @@ public final class ListPublisher: Hashable { private var observerForWillChangePersistentStore: Internals.NotificationObserver! private var observerForDidChangePersistentStore: Internals.NotificationObserver! - private lazy var observers: NSMapTable, Void>> = .weakToStrongObjects() + private lazy var observers: NSMapTable = .weakToStrongObjects() - private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedDiffableDataSourceSnapshotDelegate) { + private static func recreateFetchedResultsController( + context: NSManagedObjectContext, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void + ) -> ( + controller: Internals.CoreStoreFetchedResultsController, + delegate: Internals.FetchedDiffableDataSourceSnapshotDelegate + ) { let fetchRequest = Internals.CoreStoreFetchRequest() fetchRequest.fetchLimit = 0 @@ -339,7 +436,13 @@ public final class ListPublisher: Hashable { return (fetchedResultsController, fetchedResultsControllerDelegate) } - private init(context: NSManagedObjectContext, from: From, sectionBy: SectionBy?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, createAsynchronously: ((ListPublisher) -> Void)?) { + private init( + context: NSManagedObjectContext, + from: From, + sectionBy: SectionBy?, + applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest) -> Void, + createAsynchronously: ((ListPublisher) -> Void)? + ) { self.query = ( from: from, @@ -359,15 +462,19 @@ public final class ListPublisher: Hashable { try! self.fetchedResultsController.performFetchFromSpecifiedStores() } - private func notifyObservers() { + private func notifyObservers(sourceIdentifier: Any?) { guard let enumerator = self.observers.objectEnumerator() else { return } + let arguments: ObserverClosureType.Arguments = ( + listPublisher: self, + sourceIdentifier: sourceIdentifier + ) for closure in enumerator { - (closure as! Internals.Closure, Void>).invoke(with: self) + (closure as! ObserverClosureType).invoke(with: arguments) } } } @@ -384,11 +491,18 @@ extension ListPublisher: FetchedDiffableDataSourceSnapshotHandler { return self.query.sectionIndexTransformer } - internal func controller(_ controller: NSFetchedResultsController, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot) { + internal func controller( + _ controller: NSFetchedResultsController, + didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot + ) { - self.snapshot = .init( - diffableSnapshot: snapshot, - context: controller.managedObjectContext + let context = controller.managedObjectContext + self.set( + snapshot: .init( + diffableSnapshot: snapshot, + context: context + ), + sourceIdentifier: context.saveMetadata?.sourceIdentifier ) } } diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift index 0441b68..865d2ea 100644 --- a/Sources/ListSnapshot.swift +++ b/Sources/ListSnapshot.swift @@ -100,7 +100,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will raise an exception. - returns: the `ObjectPublisher` interfacing the object at the specified section and item index */ - public subscript(sectionIndex: Int, itemIndex: Int) -> ObjectPublisher { + public subscript( + sectionIndex: Int, + itemIndex: Int + ) -> ObjectPublisher { let context = self.context! let snapshot = self.diffableSnapshot @@ -116,7 +119,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`. - returns: the `ObjectPublisher` interfacing the object at the specified section and item index, or `nil` if out of bounds */ - public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> ObjectPublisher? { + public subscript( + safeSectionIndex sectionIndex: Int, + safeItemIndex itemIndex: Int + ) -> ObjectPublisher? { guard let context = self.context else { @@ -333,7 +339,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter indices: the positions of the itemIDs to return. Specifying an invalid value will raise an exception. - returns: the `ItemID` array belonging to the given `SectionID` at the specified indices */ - public func itemIDs(inSectionWithID sectionID: SectionID, atIndices indices: S) -> [ItemID] where S.Element == Int { + public func itemIDs( + inSectionWithID sectionID: SectionID, + atIndices indices: S + ) -> [ItemID] where S.Element == Int { let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID) return indices.map({ itemIDs[$0] }) @@ -398,7 +407,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndices: the positions of items within the section. Specifying an invalid value will raise an exception. - returns: an array of `ObjectPublisher`s for the items in the specified `SectionID` and indices */ - public func items(inSectionWithID sectionID: SectionID, atIndices itemIndices: S) -> [ObjectPublisher] where S.Element == Int { + public func items( + inSectionWithID sectionID: SectionID, + atIndices itemIndices: S + ) -> [ObjectPublisher] where S.Element == Int { let context = self.context! let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID) @@ -446,7 +458,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndices: the positions of items within the section. Specifying an invalid value will raise an exception. - returns: a lazy sequence of `ObjectPublisher`s for the items in the specified `SectionID` and indices */ - public func lazy(inSectionWithID sectionID: SectionID, atIndices itemIndices: S) -> LazyMapSequence> where S.Element == Int { + public func lazy( + inSectionWithID sectionID: SectionID, + atIndices itemIndices: S + ) -> LazyMapSequence> where S.Element == Int { let context = self.context! let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID) @@ -466,9 +481,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIDs: the object identifiers for the objects to append - parameter sectionID: the section to append the items to */ - public mutating func appendItems(withIDs itemIDs: C, toSectionWithID sectionID: SectionID? = nil) where C.Element == ItemID { + public mutating func appendItems( + withIDs itemIDs: C, + toSectionWithID sectionID: SectionID? = nil + ) where C.Element == ItemID { - self.diffableSnapshot.appendItems(itemIDs, toSection: sectionID) + self.mutate { + + $0.appendItems(itemIDs, toSection: sectionID) + } } /** @@ -477,9 +498,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIDs: the object identifiers for the objects to append - parameter sectionIndex: the section index to append the items to. Specifying an invalid value will raise an exception. */ - public mutating func appendItems(with itemIDs: C, toSectionAt sectionIndex: Int) where C.Element == ItemID { - - self.diffableSnapshot.unsafeAppendItems(itemIDs, toSectionAt: sectionIndex) + public mutating func appendItems( + with itemIDs: C, + toSectionAt sectionIndex: Int + ) where C.Element == ItemID { + + self.mutate { + + $0.unsafeAppendItems(itemIDs, toSectionAt: sectionIndex) + } } /** @@ -488,9 +515,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIDs: the object identifiers for the objects to insert - parameter beforeItemID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception. */ - public mutating func insertItems(withIDs itemIDs: C, beforeItemID: ItemID) where C.Element == ItemID { + public mutating func insertItems( + withIDs itemIDs: C, + beforeItemID: ItemID + ) where C.Element == ItemID { - self.diffableSnapshot.insertItems(itemIDs, beforeItem: beforeItemID) + self.mutate { + + $0.insertItems(itemIDs, beforeItem: beforeItemID) + } } /** @@ -499,9 +532,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIDs: the object identifiers for the objects to insert - parameter beforeItemID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception. */ - public mutating func insertItems(withIDs itemIDs: C, afterItemID: ItemID) where C.Element == ItemID { + public mutating func insertItems( + withIDs itemIDs: C, + afterItemID: ItemID + ) where C.Element == ItemID { - self.diffableSnapshot.insertItems(itemIDs, afterItem: afterItemID) + self.mutate { + + $0.insertItems(itemIDs, afterItem: afterItemID) + } } /** @@ -510,9 +549,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIDs: the object identifiers for the objects to insert - parameter indexPath: an indexPath to insert the items into. Specifying an invalid value will raise an exception. */ - public mutating func insertItems(withIDs itemIDs: C, at indexPath: IndexPath) where C.Element == ItemID { + public mutating func insertItems( + withIDs itemIDs: C, + at indexPath: IndexPath + ) where C.Element == ItemID { - self.diffableSnapshot.unsafeInsertItems(itemIDs, at: indexPath) + self.mutate { + + $0.unsafeInsertItems(itemIDs, at: indexPath) + } } /** @@ -522,7 +567,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func deleteItems(withIDs itemIDs: C) where C.Element == ItemID { - self.diffableSnapshot.deleteItems(itemIDs) + self.mutate { + + $0.deleteItems(itemIDs) + } } /** @@ -531,8 +579,11 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndexPaths: the index paths for the objects to delete. Specifying an invalid value will raise an exception. */ public mutating func deleteItems(at itemIndexPaths: C) where C.Element == IndexPath { - - self.diffableSnapshot.unsafeDeleteItems(at: itemIndexPaths) + + self.mutate { + + $0.unsafeDeleteItems(at: itemIndexPaths) + } } /** @@ -540,7 +591,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func deleteAllItems() { - self.diffableSnapshot.deleteAllItems() + self.mutate { + + $0.deleteAllItems() + } } /** @@ -549,9 +603,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemID: an object identifier in the list to move. Specifying an invalid value will raise an exception. - parameter beforeItemID: another identifier to move the item before of. Specifying an invalid value will raise an exception. */ - public mutating func moveItem(withID itemID: ItemID, beforeItemID: ItemID) { + public mutating func moveItem( + withID itemID: ItemID, + beforeItemID: ItemID + ) { - self.diffableSnapshot.moveItem(itemID, beforeItem: beforeItemID) + self.mutate { + + $0.moveItem(itemID, beforeItem: beforeItemID) + } } /** @@ -560,9 +620,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemID: an object identifier in the list to move. Specifying an invalid value will raise an exception. - parameter beforeItemID: another identifier to move the item after of. Specifying an invalid value will raise an exception. */ - public mutating func moveItem(withID itemID: ItemID, afterItemID: ItemID) { + public mutating func moveItem( + withID itemID: ItemID, + afterItemID: ItemID + ) { - self.diffableSnapshot.moveItem(itemID, afterItem: afterItemID) + self.mutate { + + $0.moveItem(itemID, afterItem: afterItemID) + } } /** @@ -571,9 +637,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndexPath: an index path in the list to move. Specifying an invalid value will raise an exception. - parameter newIndexPath: the new index path to move the item into. Specifying an invalid value will raise an exception. */ - public mutating func moveItem(at itemIndexPath: IndexPath, to newIndexPath: IndexPath) { - - self.diffableSnapshot.unsafeMoveItem(at: itemIndexPath, to: newIndexPath) + public mutating func moveItem( + at itemIndexPath: IndexPath, + to newIndexPath: IndexPath + ) { + + self.mutate { + + $0.unsafeMoveItem(at: itemIndexPath, to: newIndexPath) + } } /** @@ -583,7 +655,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func reloadItems(withIDs itemIDs: C) where C.Element == ItemID { - self.diffableSnapshot.reloadItems(itemIDs) + self.mutate { + + $0.reloadItems(itemIDs) + } } /** @@ -592,8 +667,11 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter itemIndexPaths: the index paths to reload. Specifying an invalid value will raise an exception. */ public mutating func reloadItems(at itemIndexPaths: C) where C.Element == IndexPath { - - self.diffableSnapshot.unsafeReloadItems(at: itemIndexPaths) + + self.mutate { + + $0.unsafeReloadItems(at: itemIndexPaths) + } } /** @@ -603,7 +681,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func appendSections(withIDs sectionIDs: C) where C.Element == SectionID { - self.diffableSnapshot.appendSections(sectionIDs) + self.mutate { + + $0.appendSections(sectionIDs) + } } /** @@ -612,9 +693,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIDs: the section identifiers for the sections to insert - parameter beforeSectionID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception. */ - public mutating func insertSections(withIDs sectionIDs: C, beforeSectionID: SectionID) where C.Element == SectionID { + public mutating func insertSections( + withIDs sectionIDs: C, + beforeSectionID: SectionID + ) where C.Element == SectionID { - self.diffableSnapshot.insertSections(sectionIDs, beforeSection: beforeSectionID) + self.mutate { + + $0.insertSections(sectionIDs, beforeSection: beforeSectionID) + } } /** @@ -623,9 +710,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIDs: the section identifiers for the sections to insert - parameter beforeSectionID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception. */ - public mutating func insertSections(withIDs sectionIDs: C, afterSectionID: SectionID) where C.Element == SectionID { + public mutating func insertSections( + withIDs sectionIDs: C, + afterSectionID: SectionID + ) where C.Element == SectionID { - self.diffableSnapshot.insertSections(sectionIDs, afterSection: afterSectionID) + self.mutate { + + $0.insertSections(sectionIDs, afterSection: afterSectionID) + } } /** @@ -634,9 +727,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIDs: the section identifiers for the sections to insert - parameter sectionIndex: an existing section index to insert items into. Specifying an invalid value will raise an exception. */ - public mutating func insertSections(_ sectionIDs: C, at sectionIndex: Int) where C.Element == String { - - self.diffableSnapshot.unsafeInsertSections(sectionIDs, at: sectionIndex) + public mutating func insertSections( + _ sectionIDs: C, + at sectionIndex: Int + ) where C.Element == String { + + self.mutate { + + $0.unsafeInsertSections(sectionIDs, at: sectionIndex) + } } /** @@ -646,7 +745,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func deleteSections(withIDs sectionIDs: C) where C.Element == SectionID { - self.diffableSnapshot.deleteSections(sectionIDs) + self.mutate { + + $0.deleteSections(sectionIDs) + } } /** @@ -655,8 +757,11 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIndices: the section indices to delete. Specifying an invalid value will raise an exception. */ public mutating func deleteSections(at sectionIndices: C) where C.Element == Int { - - self.diffableSnapshot.unsafeDeleteSections(at: sectionIndices) + + self.mutate { + + $0.unsafeDeleteSections(at: sectionIndices) + } } /** @@ -665,9 +770,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionID: a section identifier in the list to move. Specifying an invalid value will raise an exception. - parameter beforeSectionID: another identifier to move the section before of. Specifying an invalid value will raise an exception. */ - public mutating func moveSection(withID sectionID: SectionID, beforeSectionID: SectionID) { + public mutating func moveSection( + withID sectionID: SectionID, + beforeSectionID: SectionID + ) { - self.diffableSnapshot.moveSection(sectionID, beforeSection: beforeSectionID) + self.mutate { + + $0.moveSection(sectionID, beforeSection: beforeSectionID) + } } /** @@ -676,9 +787,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionID: a section identifier in the list to move. Specifying an invalid value will raise an exception. - parameter afterSectionID: another identifier to move the section after of. Specifying an invalid value will raise an exception. */ - public mutating func moveSection(withID sectionID: SectionID, afterSectionID: SectionID) { + public mutating func moveSection( + withID sectionID: SectionID, + afterSectionID: SectionID + ) { - self.diffableSnapshot.moveSection(sectionID, afterSection: afterSectionID) + self.mutate { + + $0.moveSection(sectionID, afterSection: afterSectionID) + } } /** @@ -687,9 +804,15 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIndex: a section index in the list to move. Specifying an invalid value will raise an exception. - parameter newSectionIndex: the new section index to move into. Specifying an invalid value will raise an exception. */ - public mutating func moveSection(at sectionIndex: Int, to newSectionIndex: Int) { - - self.diffableSnapshot.unsafeMoveSection(at: sectionIndex, to: newSectionIndex) + public mutating func moveSection( + at sectionIndex: Int, + to newSectionIndex: Int + ) { + + self.mutate { + + $0.unsafeMoveSection(at: sectionIndex, to: newSectionIndex) + } } /** @@ -699,7 +822,10 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { */ public mutating func reloadSections(withIDs sectionIDs: C) where C.Element == SectionID { - self.diffableSnapshot.reloadSections(sectionIDs) + self.mutate { + + $0.reloadSections(sectionIDs) + } } /** @@ -708,8 +834,11 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { - parameter sectionIndices: the section indices to reload. Specifying an invalid value will raise an exception. */ public mutating func reloadSections(at sectionIndices: C) where C.Element == Int { - - self.diffableSnapshot.unsafeReloadSections(at: sectionIndices) + + self.mutate { + + $0.unsafeReloadSections(at: sectionIndices) + } } @@ -791,16 +920,18 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { // MARK: Equatable public static func == (_ lhs: Self, _ rhs: Self) -> Bool { - - return lhs.id == rhs.id + + return lhs.context == rhs.context + && lhs.generation == rhs.generation } // MARK: Hashable public func hash(into hasher: inout Hasher) { - - hasher.combine(self.id) + + hasher.combine(self.context) + hasher.combine(self.generation) } @@ -827,6 +958,12 @@ public struct ListSnapshot: RandomAccessCollection, Hashable { // MARK: Private - private let id: UUID = .init() + private var generation: UUID = .init() + @inline(__always) + private mutating func mutate(_ mutation: (inout Internals.DiffableDataSourceSnapshot) -> T) -> T { + + self.generation = .init() + return mutation(&self.diffableSnapshot) + } } diff --git a/Sources/NSManagedObject+ObjectiveC.swift b/Sources/NSManagedObject+ObjectiveC.swift index 9806c78..091070d 100644 --- a/Sources/NSManagedObject+ObjectiveC.swift +++ b/Sources/NSManagedObject+ObjectiveC.swift @@ -29,47 +29,30 @@ import CoreData // MARK: - NSManagedObject +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension NSManagedObject { - /** - Provides a convenience wrapper for accessing `-primitiveValueForKey:` with proper calls to `-willAccessValueForKey:` and `-didAccessValueForKey:`. This is useful when implementing accessor methods for transient attributes. - - - parameter KVCKey: the KVC key - - returns: the primitive value for the KVC key - */ @objc public func cs_accessValueForKVCKey(_ KVCKey: KeyPathString) -> Any? { - - return self.getValue(forKvcKey: KVCKey) + + fatalError() } - - /** - Provides a convenience wrapper for setting `-setPrimitiveValue:` with proper calls to `-willChangeValueForKey:` and `-didChangeValueForKey:`. This is useful when implementing mutator methods for transient attributes. - - - parameter value: the value to set the KVC key with - - parameter KVCKey: the KVC key - */ + @objc public func cs_setValue(_ value: Any?, forKVCKey KVCKey: KeyPathString) { - - self.setValue(value, forKvcKey: KVCKey) + + fatalError() } - - /** - Re-faults the object to use the latest values from the persistent store - */ + @objc public func cs_refreshAsFault() { - - self.refreshAsFault() + + fatalError() } - - /** - Re-faults the object to use the latest values from the persistent store and merges previously pending changes back - */ + @nonobjc public func cs_refreshAndMerge() { - - self.refreshAndMerge() + + fatalError() } } diff --git a/Sources/NSManagedObjectContext+ObjectiveC.swift b/Sources/NSManagedObjectContext+ObjectiveC.swift deleted file mode 100644 index 76c3e9d..0000000 --- a/Sources/NSManagedObjectContext+ObjectiveC.swift +++ /dev/null @@ -1,142 +0,0 @@ -// -// NSManagedObjectContext+ObjectiveC.swift -// CoreStore -// -// Copyright © 2018 John Rommel Estropia -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// - -import Foundation -import CoreData - - -// MARK: - NSManagedObjectContext - -extension NSManagedObjectContext { - - // MARK: Internal - - @nonobjc - internal func fetchOne(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> NSManagedObject? { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 1 - fetchRequest.resultType = .managedObjectResultType - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.fetchOne(fetchRequest) - } - - @nonobjc - internal func fetchAll(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> [T] { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 0 - fetchRequest.resultType = .managedObjectResultType - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.fetchAll(fetchRequest) - } - - @nonobjc - internal func fetchCount(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> Int { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.resultType = .countResultType - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.fetchCount(fetchRequest) - } - - @nonobjc - internal func fetchObjectID(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> NSManagedObjectID? { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 1 - fetchRequest.resultType = .managedObjectIDResultType - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.fetchObjectID(fetchRequest) - } - - @nonobjc - internal func fetchObjectIDs(_ from: CSFrom, _ fetchClauses: [CSFetchClause]) throws -> [NSManagedObjectID] { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 0 - fetchRequest.resultType = .managedObjectIDResultType - fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.fetchObjectIDs(fetchRequest) - } - - @nonobjc - internal func deleteAll(_ from: CSFrom, _ deleteClauses: [CSDeleteClause]) throws -> Int { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 0 - fetchRequest.resultType = .managedObjectResultType - fetchRequest.returnsObjectsAsFaults = true - fetchRequest.includesPropertyValues = false - deleteClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.deleteAll(fetchRequest) - } - - @nonobjc - internal func queryValue(_ from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) throws -> Any? { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 0 - - selectClause.applyToFetchRequest(fetchRequest) - queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.queryValue(selectClause.selectTerms, fetchRequest: fetchRequest) - } - - @nonobjc - internal func queryAttributes(_ from: CSFrom, _ selectClause: CSSelect, _ queryClauses: [CSQueryClause]) throws -> [[String: Any]] { - - let fetchRequest = Internals.CoreStoreFetchRequest() - try from.bridgeToSwift.applyToFetchRequest(fetchRequest, context: self) - - fetchRequest.fetchLimit = 0 - - selectClause.applyToFetchRequest(fetchRequest) - queryClauses.forEach { $0.applyToFetchRequest(fetchRequest) } - - return try self.queryAttributes(fetchRequest) - } -} diff --git a/Sources/NSManagedObjectContext+Setup.swift b/Sources/NSManagedObjectContext+Setup.swift index 4e721da..4eb10d3 100644 --- a/Sources/NSManagedObjectContext+Setup.swift +++ b/Sources/NSManagedObjectContext+Setup.swift @@ -113,6 +113,10 @@ extension NSManagedObjectContext { return } + + let saveMetadata = rootContext.saveMetadata + context.saveMetadata = saveMetadata + let mergeChanges = { () -> Void in if let updatedObjects = (note.userInfo?[NSUpdatedObjectsKey] as? Set) { @@ -123,8 +127,9 @@ extension NSManagedObjectContext { } } context.mergeChanges(fromContextDidSave: note) + context.saveMetadata = nil } - if rootContext.isSavingSynchronously == true { + if case true? = saveMetadata?.isSavingSynchronously { context.performAndWait(mergeChanges) } diff --git a/Sources/NSManagedObjectContext+Transaction.swift b/Sources/NSManagedObjectContext+Transaction.swift index 3748c7a..08981ad 100644 --- a/Sources/NSManagedObjectContext+Transaction.swift +++ b/Sources/NSManagedObjectContext+Transaction.swift @@ -54,21 +54,21 @@ extension NSManagedObjectContext { } @nonobjc - internal var isSavingSynchronously: Bool? { + internal var saveMetadata: SaveMetadata? { get { - let value: NSNumber? = Internals.getAssociatedObjectForKey( - &PropertyKeys.isSavingSynchronously, + let value: SaveMetadata? = Internals.getAssociatedObjectForKey( + &PropertyKeys.saveMetadata, inObject: self ) - return value?.boolValue + return value } set { - Internals.setAssociatedWeakObject( - newValue.flatMap { NSNumber(value: $0) }, - forKey: &PropertyKeys.isSavingSynchronously, + Internals.setAssociatedRetainedObject( + newValue, + forKey: &PropertyKeys.saveMetadata, inObject: self ) } @@ -140,7 +140,10 @@ extension NSManagedObjectContext { } @nonobjc - internal func saveSynchronously(waitForMerge: Bool) -> (hasChanges: Bool, error: CoreStoreError?) { + internal func saveSynchronously( + waitForMerge: Bool, + sourceIdentifier: Any? + ) -> (hasChanges: Bool, error: CoreStoreError?) { var result: (hasChanges: Bool, error: CoreStoreError?) = (false, nil) self.performAndWait { @@ -151,9 +154,12 @@ extension NSManagedObjectContext { } do { - self.isSavingSynchronously = waitForMerge + self.saveMetadata = .init( + isSavingSynchronously: waitForMerge, + sourceIdentifier: sourceIdentifier + ) try self.save() - self.isSavingSynchronously = nil + self.saveMetadata = nil } catch { @@ -167,7 +173,10 @@ extension NSManagedObjectContext { } if let parentContext = self.parent, self.shouldCascadeSavesToParent { - let (_, error) = parentContext.saveSynchronously(waitForMerge: waitForMerge) + let (_, error) = parentContext.saveSynchronously( + waitForMerge: waitForMerge, + sourceIdentifier: sourceIdentifier + ) result = (true, error) } else { @@ -179,7 +188,10 @@ extension NSManagedObjectContext { } @nonobjc - internal func saveAsynchronouslyWithCompletion(_ completion: @escaping (_ hasChanges: Bool, _ error: CoreStoreError?) -> Void = { (_, _) in }) { + internal func saveAsynchronously( + sourceIdentifier: Any?, + completion: @escaping (_ hasChanges: Bool, _ error: CoreStoreError?) -> Void = { (_, _) in } + ) { self.perform { @@ -193,9 +205,12 @@ extension NSManagedObjectContext { } do { - self.isSavingSynchronously = false + self.saveMetadata = .init( + isSavingSynchronously: false, + sourceIdentifier: sourceIdentifier + ) try self.save() - self.isSavingSynchronously = nil + self.saveMetadata = nil } catch { @@ -212,10 +227,13 @@ extension NSManagedObjectContext { } if self.shouldCascadeSavesToParent, let parentContext = self.parent { - parentContext.saveAsynchronouslyWithCompletion { (_, error) in - - completion(true, error) - } + parentContext.saveAsynchronously( + sourceIdentifier: sourceIdentifier, + completion: { (_, error) in + + completion(true, error) + } + ) } else { @@ -250,12 +268,32 @@ extension NSManagedObjectContext { } + // MARK: - SaveMetadata + + internal final class SaveMetadata { + + // MARK: Internal + + internal let isSavingSynchronously: Bool + internal let sourceIdentifier: Any? + + internal init( + isSavingSynchronously: Bool, + sourceIdentifier: Any? + ) { + + self.isSavingSynchronously = isSavingSynchronously + self.sourceIdentifier = sourceIdentifier + } + } + + // MARK: Private private struct PropertyKeys { static var parentTransaction: Void? - static var isSavingSynchronously: Void? + static var saveMetadata: Void? static var isTransactionContext: Void? static var isDataStackContext: Void? } diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift index dcc9c1b..f81b983 100644 --- a/Sources/ObjectMonitor.swift +++ b/Sources/ObjectMonitor.swift @@ -78,15 +78,28 @@ public final class ObjectMonitor: Hashable, ObjectRepresentati observer, willChangeObject: { (observer, monitor, object) in - observer.objectMonitor(monitor, willUpdateObject: object) + observer.objectMonitor( + monitor, + willUpdateObject: object, + sourceIdentifier: monitor.context.saveMetadata?.sourceIdentifier + ) }, didDeleteObject: { (observer, monitor, object) in - observer.objectMonitor(monitor, didDeleteObject: object) + observer.objectMonitor( + monitor, + didDeleteObject: object, + sourceIdentifier: monitor.context.saveMetadata?.sourceIdentifier + ) }, didUpdateObject: { (observer, monitor, object, changedPersistentKeys) in - observer.objectMonitor(monitor, didUpdateObject: object, changedPersistentKeys: changedPersistentKeys) + observer.objectMonitor( + monitor, + didUpdateObject: object, + changedPersistentKeys: changedPersistentKeys, + sourceIdentifier: monitor.context.saveMetadata?.sourceIdentifier + ) } ) } @@ -197,7 +210,10 @@ public final class ObjectMonitor: Hashable, ObjectRepresentati // MARK: Internal - internal init(objectID: O.ObjectID, context: NSManagedObjectContext) { + internal init( + objectID: O.ObjectID, + context: NSManagedObjectContext + ) { let fetchRequest = Internals.CoreStoreFetchRequest() fetchRequest.entity = objectID.entity @@ -227,7 +243,25 @@ public final class ObjectMonitor: Hashable, ObjectRepresentati self.lastCommittedAttributes = (self.object?.cs_toRaw().committedValues(forKeys: nil) as? [String: NSObject]) ?? [:] } - internal func registerObserver(_ observer: U, willChangeObject: @escaping (_ observer: U, _ monitor: ObjectMonitor, _ object: O) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ObjectMonitor, _ object: O) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ObjectMonitor, _ object: O, _ changedPersistentKeys: Set) -> Void) { + internal func registerObserver( + _ observer: U, + willChangeObject: @escaping ( + _ observer: U, + _ monitor: ObjectMonitor, + _ object: O + ) -> Void, + didDeleteObject: @escaping ( + _ observer: U, + _ monitor: ObjectMonitor, + _ object: O + ) -> Void, + didUpdateObject: @escaping ( + _ observer: U, + _ monitor: ObjectMonitor, + _ object: O, + _ changedPersistentKeys: Set + ) -> Void + ) { Internals.assert( Thread.isMainThread, @@ -323,7 +357,12 @@ public final class ObjectMonitor: Hashable, ObjectRepresentati return self.fetchedResultsController.managedObjectContext } - private func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor) -> Void) { + private func registerChangeNotification( + _ notificationKey: UnsafeRawPointer, + name: Notification.Name, + toObserver observer: AnyObject, + callback: @escaping (_ monitor: ObjectMonitor) -> Void + ) { Internals.setAssociatedRetainedObject( Internals.NotificationObserver( @@ -343,7 +382,12 @@ public final class ObjectMonitor: Hashable, ObjectRepresentati ) } - private func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor, _ object: O) -> Void) { + private func registerObjectNotification( + _ notificationKey: UnsafeRawPointer, + name: Notification.Name, + toObserver observer: AnyObject, + callback: @escaping (_ monitor: ObjectMonitor, _ object: O) -> Void + ) { Internals.setAssociatedRetainedObject( Internals.NotificationObserver( @@ -384,7 +428,9 @@ extension ObjectMonitor: FetchedResultsControllerHandler { return { _ in nil } } - internal func controllerWillChangeContent(_ controller: NSFetchedResultsController) { + internal func controllerWillChangeContent( + _ controller: NSFetchedResultsController + ) { NotificationCenter.default.post( name: Notification.Name.objectMonitorWillChangeObject, @@ -392,9 +438,17 @@ extension ObjectMonitor: FetchedResultsControllerHandler { ) } - internal func controllerDidChangeContent(_ controller: NSFetchedResultsController) { } + internal func controllerDidChangeContent( + _ controller: NSFetchedResultsController + ) {} - internal func controller(_ controller: NSFetchedResultsController, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) { + internal func controller( + _ controller: NSFetchedResultsController, + didChangeObject anObject: Any, + atIndexPath indexPath: IndexPath?, + forChangeType type: NSFetchedResultsChangeType, + newIndexPath: IndexPath? + ) { switch type { @@ -418,7 +472,12 @@ extension ObjectMonitor: FetchedResultsControllerHandler { } } - internal func controller(_ controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) { } + internal func controller( + _ controller: NSFetchedResultsController, + didChangeSection sectionInfo: NSFetchedResultsSectionInfo, + atIndex sectionIndex: Int, + forChangeType type: NSFetchedResultsChangeType + ) {} } diff --git a/Sources/ObjectObserver.swift b/Sources/ObjectObserver.swift index f2fa9cb..109ed92 100644 --- a/Sources/ObjectObserver.swift +++ b/Sources/ObjectObserver.swift @@ -49,8 +49,41 @@ public protocol ObjectObserver: AnyObject { - parameter monitor: the `ObjectMonitor` monitoring the object being observed - parameter object: the `DynamicObject` instance being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source */ - func objectMonitor(_ monitor: ObjectMonitor, willUpdateObject object: ObjectEntityType) + func objectMonitor( + _ monitor: ObjectMonitor, + willUpdateObject object: ObjectEntityType, + sourceIdentifier: Any? + ) + + /** + Handles processing just before a change to the observed `object` occurs. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ObjectMonitor` monitoring the object being observed + - parameter object: the `DynamicObject` instance being observed + */ + func objectMonitor( + _ monitor: ObjectMonitor, + willUpdateObject object: ObjectEntityType + ) + + /** + Handles processing right after a change to the observed `object` occurs. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ObjectMonitor` monitoring the object being observed + - parameter object: the `DynamicObject` instance being observed + - parameter changedPersistentKeys: a `Set` of key paths for the attributes that were changed. Note that `changedPersistentKeys` only contains keys for attributes/relationships present in the persistent store, thus transient properties will not be reported. + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func objectMonitor( + _ monitor: ObjectMonitor, + didUpdateObject object: ObjectEntityType, + changedPersistentKeys: Set, + sourceIdentifier: Any? + ) /** Handles processing right after a change to the observed `object` occurs. (Optional) @@ -60,7 +93,25 @@ public protocol ObjectObserver: AnyObject { - parameter object: the `DynamicObject` instance being observed - parameter changedPersistentKeys: a `Set` of key paths for the attributes that were changed. Note that `changedPersistentKeys` only contains keys for attributes/relationships present in the persistent store, thus transient properties will not be reported. */ - func objectMonitor(_ monitor: ObjectMonitor, didUpdateObject object: ObjectEntityType, changedPersistentKeys: Set) + func objectMonitor( + _ monitor: ObjectMonitor, + didUpdateObject object: ObjectEntityType, + changedPersistentKeys: Set + ) + + /** + Handles processing right after `object` is deleted. (Optional) + The default implementation does nothing. + + - parameter monitor: the `ObjectMonitor` monitoring the object being observed + - parameter object: the `DynamicObject` instance being observed + - parameter sourceIdentifier: an optional identifier provided by the transaction source + */ + func objectMonitor( + _ monitor: ObjectMonitor, + didDeleteObject object: ObjectEntityType, + sourceIdentifier: Any? + ) /** Handles processing right after `object` is deleted. (Optional) @@ -69,7 +120,10 @@ public protocol ObjectObserver: AnyObject { - parameter monitor: the `ObjectMonitor` monitoring the object being observed - parameter object: the `DynamicObject` instance being observed */ - func objectMonitor(_ monitor: ObjectMonitor, didDeleteObject object: ObjectEntityType) + func objectMonitor( + _ monitor: ObjectMonitor, + didDeleteObject object: ObjectEntityType + ) } @@ -77,9 +131,57 @@ public protocol ObjectObserver: AnyObject { extension ObjectObserver { - public func objectMonitor(_ monitor: ObjectMonitor, willUpdateObject object: ObjectEntityType) { } + public func objectMonitor( + _ monitor: ObjectMonitor, + willUpdateObject object: ObjectEntityType, + sourceIdentifier: Any? + ) { + + self.objectMonitor( + monitor, + willUpdateObject: object + ) + } - public func objectMonitor(_ monitor: ObjectMonitor, didUpdateObject object: ObjectEntityType, changedPersistentKeys: Set) { } + public func objectMonitor( + _ monitor: ObjectMonitor, + willUpdateObject object: ObjectEntityType + ) {} - public func objectMonitor(_ monitor: ObjectMonitor, didDeleteObject object: ObjectEntityType) { } + public func objectMonitor( + _ monitor: ObjectMonitor, + didUpdateObject object: ObjectEntityType, + changedPersistentKeys: Set, + sourceIdentifier: Any? + ) { + + self.objectMonitor( + monitor, + didUpdateObject: object, + changedPersistentKeys: changedPersistentKeys + ) + } + + public func objectMonitor( + _ monitor: ObjectMonitor, + didUpdateObject object: ObjectEntityType, + changedPersistentKeys: Set + ) {} + + public func objectMonitor( + _ monitor: ObjectMonitor, + didDeleteObject object: ObjectEntityType, + sourceIdentifier: Any? + ) { + + self.objectMonitor( + monitor, + didDeleteObject: object + ) + } + + public func objectMonitor( + _ monitor: ObjectMonitor, + didDeleteObject object: ObjectEntityType + ) {} } diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift index c958bee..2e0ebac 100644 --- a/Sources/ObjectPublisher.swift +++ b/Sources/ObjectPublisher.swift @@ -87,7 +87,7 @@ public final class ObjectPublisher: ObjectRepresentation, Hash "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread." ) self.observers.setObject( - Internals.Closure(callback), + Internals.Closure({ callback($0.objectPublisher) }), forKey: observer ) _ = self.lazySnapshot @@ -97,6 +97,46 @@ public final class ObjectPublisher: ObjectRepresentation, Hash callback(self) } } + + /** + Registers an object as an observer to be notified when changes to the `ObjectPublisher`'s snapshot occur. + + To prevent retain-cycles, `ObjectPublisher` only keeps `weak` references to its observers. + + For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread. + + Calling `addObserver(_:_:)` multiple times on the same observer is safe. + + - parameter observer: an object to become owner of the specified `callback` + - parameter notifyInitial: if `true`, the callback is executed immediately with the current publisher state. Otherwise only succeeding updates will notify the observer. Default value is `false`. + - parameter initialSourceIdentifier: an optional value that identifies the initial callback invocation if `notifyInitial` is `true`. + - parameter callback: the closure to execute when changes occur + */ + public func addObserver( + _ observer: T, + notifyInitial: Bool = false, + initialSourceIdentifier: Any? = nil, + _ callback: @escaping ( + _ objectPublisher: ObjectPublisher, + _ sourceIdentifier: Any? + ) -> Void + ) { + + Internals.assert( + Thread.isMainThread, + "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread." + ) + self.observers.setObject( + Internals.Closure(callback), + forKey: observer + ) + _ = self.lazySnapshot + + if notifyInitial { + + callback(self, initialSourceIdentifier) + } + } /** Unregisters an object from receiving notifications for changes to the `ObjectPublisher`'s snapshot. @@ -215,6 +255,8 @@ public final class ObjectPublisher: ObjectRepresentation, Hash // MARK: FilePrivate + + fileprivate typealias ObserverClosureType = Internals.Closure<(objectPublisher: ObjectPublisher, sourceIdentifier: Any?), Void> fileprivate init(objectID: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot?) { @@ -237,12 +279,12 @@ public final class ObjectPublisher: ObjectRepresentation, Hash self.object = nil self.$lazySnapshot.reset({ nil }) - self.notifyObservers() + self.notifyObservers(sourceIdentifier: self.context.saveMetadata) } else if updatedIDs.contains(objectID) { self.$lazySnapshot.reset({ initializer(objectID, context) }) - self.notifyObservers() + self.notifyObservers(sourceIdentifier: self.context.saveMetadata) } } return initializer(objectID, context) @@ -258,18 +300,21 @@ public final class ObjectPublisher: ObjectRepresentation, Hash @Internals.LazyNonmutating(uninitialized: ()) private var lazySnapshot: ObjectSnapshot? - private lazy var observers: NSMapTable, Void>> = .weakToStrongObjects() + private lazy var observers: NSMapTable = .weakToStrongObjects() - private func notifyObservers() { + private func notifyObservers(sourceIdentifier: Any?) { guard let enumerator = self.observers.objectEnumerator() else { return } + let arguments: ObserverClosureType.Arguments = ( + objectPublisher: self, + sourceIdentifier: sourceIdentifier + ) for closure in enumerator { - (closure as! Internals.Closure, Void>).invoke(with: self) + (closure as! ObserverClosureType).invoke(with: arguments) } } } diff --git a/Sources/Progress+ObjectiveC.swift b/Sources/Progress+ObjectiveC.swift index e913ff8..af0ff79 100644 --- a/Sources/Progress+ObjectiveC.swift +++ b/Sources/Progress+ObjectiveC.swift @@ -28,16 +28,12 @@ import Foundation // MARK: - Progress +@available(*, unavailable, message: "CoreStore Objective-C is now obsoleted in preparation for Swift concurrency.") extension Progress { - - /** - Sets a closure that the `NSProgress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO. - - - parameter closure: the closure to execute on progress change - */ + @objc dynamic public func cs_setProgressHandler(_ closure: ((_ progress: Progress) -> Void)?) { - - self.setProgressHandler(closure) + + fatalError() } } diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift index 1ad24f8..d31459d 100644 --- a/Sources/SynchronousDataTransaction.swift +++ b/Sources/SynchronousDataTransaction.swift @@ -147,15 +147,28 @@ public final class SynchronousDataTransaction: BaseDataTransaction { // MARK: Internal - internal init(mainContext: NSManagedObjectContext, queue: DispatchQueue) { + internal init( + mainContext: NSManagedObjectContext, + queue: DispatchQueue, + sourceIdentifier: Any? + ) { - super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false) + super.init( + mainContext: mainContext, + queue: queue, + supportsUndo: false, + bypassesQueueing: false, + sourceIdentifier: sourceIdentifier + ) } internal func autoCommit(waitForMerge: Bool) -> (hasChanges: Bool, error: CoreStoreError?) { self.isCommitted = true - let result = self.context.saveSynchronously(waitForMerge: waitForMerge) + let result = self.context.saveSynchronously( + waitForMerge: waitForMerge, + sourceIdentifier: self.sourceIdentifier + ) self.result = result defer { diff --git a/Sources/UnsafeDataTransaction.swift b/Sources/UnsafeDataTransaction.swift index 103bce2..2ec3f25 100644 --- a/Sources/UnsafeDataTransaction.swift +++ b/Sources/UnsafeDataTransaction.swift @@ -43,11 +43,14 @@ public final class UnsafeDataTransaction: BaseDataTransaction { */ public func commit(_ completion: @escaping (_ error: CoreStoreError?) -> Void) { - self.context.saveAsynchronouslyWithCompletion { (_, error) in - - completion(error) - withExtendedLifetime(self, {}) - } + self.context.saveAsynchronously( + sourceIdentifier: self.sourceIdentifier, + completion: { (_, error) in + + completion(error) + withExtendedLifetime(self, {}) + } + ) } /** @@ -57,7 +60,10 @@ public final class UnsafeDataTransaction: BaseDataTransaction { */ public func commitAndWait() throws { - if case (_, let error?) = self.context.saveSynchronously(waitForMerge: true) { + if case (_, let error?) = self.context.saveSynchronously( + waitForMerge: true, + sourceIdentifier: self.sourceIdentifier + ) { throw error } @@ -126,23 +132,39 @@ public final class UnsafeDataTransaction: BaseDataTransaction { /** Begins a child transaction where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. - - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. + - parameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited. + - parameter sourceIdentifier: an optional value that identifies the source of this transaction. This identifier will be passed to the change notifications and callers can use it for custom handling that depends on the source. - returns: an `UnsafeDataTransaction` instance where creates, updates, and deletes can be made. */ - public func beginUnsafe(supportsUndo: Bool = false) -> UnsafeDataTransaction { + public func beginUnsafe( + supportsUndo: Bool = false, + sourceIdentifier: Any? = nil + ) -> UnsafeDataTransaction { return UnsafeDataTransaction( mainContext: self.context, queue: self.transactionQueue, - supportsUndo: supportsUndo + supportsUndo: supportsUndo, + sourceIdentifier: sourceIdentifier ) } // MARK: Internal - internal init(mainContext: NSManagedObjectContext, queue: DispatchQueue, supportsUndo: Bool) { + internal init( + mainContext: NSManagedObjectContext, + queue: DispatchQueue, + supportsUndo: Bool, + sourceIdentifier: Any? + ) { - super.init(mainContext: mainContext, queue: queue, supportsUndo: supportsUndo, bypassesQueueing: true) + super.init( + mainContext: mainContext, + queue: queue, + supportsUndo: supportsUndo, + bypassesQueueing: true, + sourceIdentifier: sourceIdentifier + ) } }