README bug

Fixes #328 by specifying platform requirements in Package.swift

.cocoapods.yml

@@ -0,0 +1,2 @@
+try:
+  project: 'CoreStore.xcworkspace'

.gitignore

@@ -7,3 +7,8 @@ CoreStore.xcworkspace/xcuserdata
 .DS_Store
 DerivedData
 *.orig
+build
+Playground_macOS.playground/playground.xcworkspace/xcuserdata
+.swiftpm/xcode/package.xcworkspace/xcuserdata
+.swiftpm/xcode/xcuserdata
+Playground_iOS.playground/playground.xcworkspace/xcuserdata

.jazzy.yaml

@@ -0,0 +1,15 @@
+author: John Estropia
+author_url: https://github.com/JohnEstropia
+github_url: https://github.com/JohnEstropia/CoreStore
+module: CoreStore
+readme: README.md
+include: Sources/*
+output: docs
+theme: fullwidth
+clean: true
+skip_undocumented: true
+xcodebuild_arguments:
+- -sdk
+- iphonesimulator
+- -scheme
+- CoreStore iOS

.swift-version

@@ -1 +0,0 @@
-3.0.1

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

.swiftpm/xcode/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CoreStore.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

.travis.yml

@@ -1,44 +0,0 @@
-language: objective-c
-osx_image: xcode8.2
-sudo: false
-git:
-  submodules: false
-notifications:
-  email: false
-env:
-  global:
-  - LC_CTYPE=en_US.UTF-8
-  - LANG=en_US.UTF-8
-  matrix:
-    - DESTINATION="OS=10.1,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator10.2  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                    SCHEME="CoreStore OSX"     SDK=macosx10.12          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=3.1,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator3.1    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator3.1    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator10.1 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator10.1 RUN_TESTS="YES" POD_LINT="NO"
-before_install:
-  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
-  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
-  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.18/Carthage.pkg"
-  - sudo installer -pkg "Carthage.pkg" -target /
-  - rm "Carthage.pkg"
-before_script:
-  - carthage update --use-submodules
-script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - if [ $RUN_TESTS == "YES" ]; then 
-      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-    fi
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator10.2" -destination "OS=10.1,name=iPhone 7" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator10.2" -destination "OS=10.1,name=iPhone 7" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint --quick;
-    fi

CoreStore.podspec

@@ -1,22 +1,22 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "3.0.3"
+    s.version = "7.0.0"
+    s.swift_version = "5.1"
     s.license = "MIT"
-    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
+    s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
+    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
     s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }
 
-    s.ios.deployment_target = "8.0"
-    s.osx.deployment_target = "10.10"
-    s.watchos.deployment_target = "2.0"
-    s.tvos.deployment_target = "9.0"
+    s.ios.deployment_target = "10.0"
+    s.osx.deployment_target = "10.12"
+    s.watchos.deployment_target = "3.0"
+    s.tvos.deployment_target = "10.0"
 
     s.source_files = "Sources", "Sources/**/*.{swift,h,m}"
     s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D USE_FRAMEWORKS -D DEBUG',
-                              'OTHER_SWIFT_FLAGS[config=Release]' => '-D USE_FRAMEWORKS',
-                              'GCC_PREPROCESSOR_DEFINITIONS' => 'USE_FRAMEWORKS=1' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine' }
 end

CoreStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore OSX"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore OSX"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,22 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore iOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +69,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore iOS"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -84,8 +89,12 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.SQLDebug 2"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore tvOS"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

CoreStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj

@@ -7,12 +7,14 @@
 	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 */; };
-		B5125C141B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B5125C131B521BA7003A42C7 /* OrganismV3ToV2.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 */; };
@@ -24,6 +26,8 @@
 		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 */; };
@@ -35,6 +39,8 @@
 		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, ); }; };
@@ -60,6 +66,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		B50132232344E24300FC238B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
+		B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIContainerViewController.swift; sourceTree = "<group>"; };
+		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 = "<group>"; };
 		B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADD1AFDC71700F90881 /* Palette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Palette.swift; sourceTree = "<group>"; };
@@ -79,6 +88,8 @@
 		B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2ToV3MigrationPolicy.swift; sourceTree = "<group>"; };
+		B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewDemoViewController.swift; sourceTree = "<group>"; };
+		B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionViewCell.swift; sourceTree = "<group>"; };
 		B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackSetupDemoViewController.swift; sourceTree = "<group>"; };
 		B566E3311B11DF3200F4F0C6 /* UserAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAccount.swift; sourceTree = "<group>"; };
 		B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomLoggerViewController.swift; sourceTree = "<group>"; };
@@ -90,7 +101,9 @@
 		B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = "<group>"; };
 		B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = "<group>"; };
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
+		B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsDemo.swift; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
@@ -106,6 +119,7 @@
 			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 */,
@@ -115,14 +129,27 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		B50132222344E20B00FC238B /* SwiftUI Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B50132232344E24300FC238B /* SwiftUIView.swift */,
+				B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */,
+			);
+			path = "SwiftUI Demo";
+			sourceTree = "<group>";
+		};
 		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 = "<group>";
@@ -139,6 +166,7 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B501323423477D2300FC238B /* SwiftUI.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
 				B5BDC9211C202429008147CD /* CoreStore.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
@@ -167,6 +195,7 @@
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
+				B50132222344E20B00FC238B /* SwiftUI Demo */,
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
 				B52977DB1B120F2C003D50A5 /* Transactions Demo */,
@@ -266,18 +295,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
 						CreatedOnToolsVersion = 6.3;
-						LastSwiftMigration = 0800;
+						DevelopmentTeam = 2JT32EJ5BH;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
 			buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -312,6 +342,7 @@
 			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 */,
@@ -323,6 +354,7 @@
 				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 */,
@@ -331,13 +363,16 @@
 				B503FAE11AFDC71700F90881 /* Palette.swift in Sources */,
 				B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */,
 				B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */,
-				B5125C141B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel 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 */,
 			);
@@ -373,14 +408,22 @@
 				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_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;
@@ -404,11 +447,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				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;
 		};
@@ -420,14 +465,22 @@
 				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_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;
@@ -444,9 +497,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				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;
@@ -455,12 +510,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 2JT32EJ5BH;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 			};
 			name = Debug;
 		};
@@ -468,13 +523,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 2JT32EJ5BH;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 			};
 			name = Release;
 		};

CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

CoreStoreDemo/CoreStoreDemo/AppDelegate.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -18,9 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
-        
-        application.statusBarStyle = .lightContent
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         
         return true
     }

CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib

@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10112" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,10 +14,10 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2018 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="440" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="CoreStoreIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q8C-V6-gXH">
@@ -24,11 +26,11 @@
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="273" width="440" height="57.5"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>

CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents

@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="10169.1" systemVersion="15D21" minimumToolsVersion="Automatic">
-    <entity name="Palette" representedClassName="CoreStoreDemo.Palette">
-        <attribute name="brightness" optional="YES" attributeType="Float" defaultValueString="0.0" syncable="YES"/>
-        <attribute name="colorName" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
-        <attribute name="hue" optional="YES" attributeType="Integer 32" defaultValueString="0.0" syncable="YES"/>
-        <attribute name="saturation" optional="YES" attributeType="Float" defaultValueString="0.0" syncable="YES"/>
-        <userInfo/>
-    </entity>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16F73" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="Place" representedClassName="CoreStoreDemo.Place" syncable="YES">
-        <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
-        <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
+        <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="subtitle" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <entity name="TimeZone" representedClassName="CoreStoreDemo.TimeZone" syncable="YES">
         <attribute name="abbreviation" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="daylightSavingTimeOffset" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
-        <attribute name="hasDaylightSavingTime" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="daylightSavingTimeOffset" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="hasDaylightSavingTime" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="secondsFromGMT" optional="YES" attributeType="Integer 32" defaultValueString="0.0" syncable="YES"/>
+        <attribute name="secondsFromGMT" optional="YES" attributeType="Integer 32" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <configuration name="FetchingAndQueryingDemo">
         <memberEntity name="TimeZone"/>
     </configuration>
-    <configuration name="ObservingDemo">
-        <memberEntity name="Palette"/>
-    </configuration>
     <configuration name="TransactionsDemo">
         <memberEntity name="Place"/>
     </configuration>
     <elements>
-        <element name="Palette" positionX="261" positionY="189" width="128" height="105"/>
         <element name="Place" positionX="261" positionY="225" width="128" height="105"/>
         <element name="TimeZone" positionX="297" positionY="270" width="128" height="120"/>
     </elements>

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -22,26 +22,24 @@ private struct Static {
                 localStorageOptions: .recreateStoreOnModelMismatch
             )
         )
-    
-        _ = dataStack.beginSynchronous { (transaction) -> Void in
-            
-            transaction.deleteAll(From<TimeZone>())
-            
-            for name in NSTimeZone.knownTimeZoneNames {
+        _ = try? dataStack.perform(
+            synchronous: { (transaction) in
                 
-                let rawTimeZone = NSTimeZone(name: name)!
-                let cachedTimeZone = transaction.create(Into<TimeZone>())
+                try transaction.deleteAll(From<TimeZone>())
                 
-                cachedTimeZone.name = rawTimeZone.name
-                cachedTimeZone.abbreviation = rawTimeZone.abbreviation ?? ""
-                cachedTimeZone.secondsFromGMT = Int32(rawTimeZone.secondsFromGMT)
-                cachedTimeZone.hasDaylightSavingTime = rawTimeZone.isDaylightSavingTime
-                cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset
+                for name in NSTimeZone.knownTimeZoneNames {
+                    
+                    let rawTimeZone = NSTimeZone(name: name)!
+                    let cachedTimeZone = transaction.create(Into<TimeZone>())
+                    
+                    cachedTimeZone.name = rawTimeZone.name
+                    cachedTimeZone.abbreviation = rawTimeZone.abbreviation ?? ""
+                    cachedTimeZone.secondsFromGMT = Int32(rawTimeZone.secondsFromGMT)
+                    cachedTimeZone.hasDaylightSavingTime = rawTimeZone.isDaylightSavingTime
+                    cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset
+                }
             }
-            
-            _ = transaction.commitAndWait()
-        }
-        
+        )
         return dataStack
     }()
 }
@@ -166,67 +164,80 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             title: "All Time Zones",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
-                    From<TimeZone>(),
-                    OrderBy(.ascending(#keyPath(TimeZone.name)))
-                )!
+                return try! Static.timeZonesStack.fetchAll(
+                    From<TimeZone>()
+                        .orderBy(.ascending(\.name))
+                )
             }
         ),
         (
             title: "Time Zones in Asia",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
-                    From<TimeZone>(),
-                    Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Asia"),
-                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
-                )!
+                return try! Static.timeZonesStack.fetchAll(
+                    From<TimeZone>()
+                        .where(
+                            format: "%K BEGINSWITH[c] %@",
+                            #keyPath(TimeZone.name),
+                            "Asia"
+                        )
+                        .orderBy(.ascending(\.secondsFromGMT))
+                )
             }
         ),
         (
             title: "Time Zones in America and Europe",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
-                    From<TimeZone>(),
-                    Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America")
-                        || Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "Europe"),
-                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
-                )!
+                return try! Static.timeZonesStack.fetchAll(
+                    From<TimeZone>()
+                        .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 Static.timeZonesStack.fetchAll(
-                    From<TimeZone>(),
-                    !Where("%K BEGINSWITH[c] %@", #keyPath(TimeZone.name), "America"),
-                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)))
-                    )!
+                return try! Static.timeZonesStack.fetchAll(
+                    From<TimeZone>()
+                        .where(
+                            format: "%K BEGINSWITH[c] %@",
+                            #keyPath(TimeZone.name),
+                            "America"
+                        )
+                        .orderBy(.ascending(\.secondsFromGMT))
+                    )
             }
         ),
         (
             title: "Time Zones with Summer Time",
             fetch: { () -> [TimeZone] in
                 
-                return Static.timeZonesStack.fetchAll(
-                    From<TimeZone>(),
-                    Where("hasDaylightSavingTime", isEqualTo: true),
-                    OrderBy(.ascending(#keyPath(TimeZone.name)))
-                )!
+                return try! Static.timeZonesStack.fetchAll(
+                    From<TimeZone>()
+                        .where(\.hasDaylightSavingTime == true)
+                        .orderBy(.ascending(\.name))
+                )
             }
         )
     ]
     
-    private let queryingItems = [
+    private let queryingItems: [(title: String, query: () -> Any)] = [
         (
             title: "Number of Time Zones",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryValue(
-                    From<TimeZone>(),
-                    Select<NSNumber>(.count(#keyPath(TimeZone.name)))
+                return try! Static.timeZonesStack.queryValue(
+                    From<TimeZone>()
+                        .select(NSNumber.self, .count(\.name))
                 )!
             }
         ),
@@ -234,10 +245,10 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             title: "Abbreviation For Tokyo's Time Zone",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryValue(
-                    From<TimeZone>(),
-                    Select<String>(#keyPath(TimeZone.abbreviation)),
-                    Where("%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo")
+                return try! Static.timeZonesStack.queryValue(
+                    From<TimeZone>()
+                        .select(String.self, .attribute(\.abbreviation))
+                        .where(format: "%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo")
                 )!
             }
         ),
@@ -245,38 +256,53 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
             title: "All Abbreviations",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryAttributes(
-                    From<TimeZone>(),
-                    Select<NSDictionary>(#keyPath(TimeZone.name), #keyPath(TimeZone.abbreviation)),
-                    OrderBy(.ascending(#keyPath(TimeZone.name)))
-                )!
+                return try! Static.timeZonesStack.queryAttributes(
+                    From<TimeZone>()
+                        .select(
+                            NSDictionary.self,
+                            .attribute(\.name),
+                            .attribute(\.abbreviation)
+                        )
+                        .orderBy(.ascending(\.name))
+                )
             }
         ),
         (
             title: "Number of Countries per Time Zone",
             query: { () -> Any in
                 
-                return Static.timeZonesStack.queryAttributes(
-                    From<TimeZone>(),
-                    Select<NSDictionary>(.count(#keyPath(TimeZone.abbreviation)), #keyPath(TimeZone.abbreviation)),
-                    GroupBy(#keyPath(TimeZone.abbreviation)),
-                    OrderBy(.ascending(#keyPath(TimeZone.secondsFromGMT)), .ascending(#keyPath(TimeZone.name)))
-                )!
+                return try! Static.timeZonesStack.queryAttributes(
+                    From<TimeZone>()
+                        .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 Static.timeZonesStack.queryAttributes(
-                    From<TimeZone>(),
-                    Select<NSDictionary>(
-                        .count(#keyPath(TimeZone.hasDaylightSavingTime), as: "numberOfCountries"),
-                        #keyPath(TimeZone.hasDaylightSavingTime)
-                    ),
-                    GroupBy(#keyPath(TimeZone.hasDaylightSavingTime)),
-                    OrderBy(.descending(#keyPath(TimeZone.hasDaylightSavingTime)))
-                )!
+                return try! Static.timeZonesStack.queryAttributes(
+                    From<TimeZone>()
+                        .select(
+                            NSDictionary.self,
+                            .count(\.hasDaylightSavingTime, as: "numberOfCountries"),
+                            .attribute(\.hasDaylightSavingTime)
+                        )
+                        .groupBy(\.hasDaylightSavingTime)
+                        .orderBy(
+                            .descending(\.hasDaylightSavingTime),
+                            .ascending(\.name)
+                        )
+                )
             }
         )
     ]

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -30,7 +30,7 @@ class FetchingResultsViewController: UITableViewController {
         super.viewDidLoad()
         
         self.tableView.estimatedRowHeight = 60
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
     }
     
     

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -49,7 +49,7 @@ class QueryingResultsViewController: UITableViewController {
         super.viewDidLoad()
         
         self.tableView.estimatedRowHeight = 60
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
     }
     
     

CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/15.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -32,6 +42,36 @@
       "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",
@@ -44,6 +84,22 @@
       "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",

CoreStoreDemo/CoreStoreDemo/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>6.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -50,5 +50,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift

@@ -0,0 +1,169 @@
+//
+//  CollectionViewDemoViewController.swift
+//  CoreStoreDemo
+//
+//  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.CollectionView<Palette>(
+            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<Palette>):
+            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.CollectionView<Palette>?
+
+    deinit {
+
+        ColorsDemo.palettes.removeObserver(self)
+    }
+
+    @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
+
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                try transaction.deleteAll(From<Palette>())
+            },
+            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
+
+                let palette = transaction.create(Into<Palette>())
+                palette.setInitialValues(in: transaction)
+            },
+            completion: { _ in }
+        )
+    }
+
+    @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                for palette in try transaction.fetchAll(From<Palette>()) {
+
+                    palette.hue .= Palette.randomHue()
+                    palette.colorName .= nil
+                }
+            },
+            completion: { _ in }
+        )
+    }
+}

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift

@@ -0,0 +1,88 @@
+//
+//  ColorsDemo.swift
+//  CoreStoreDemo
+//
+//  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<Palette> {
+            
+            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<Palette>()
+                    .sectionBy(\.colorName)
+                    .where(self.filter.whereClause())
+                    .orderBy(.ascending(\.hue))
+            )
+        }
+    }
+    
+    static let stack: DataStack = {
+     
+        let dataStack = DataStack(
+            CoreStoreSchema(
+                modelVersion: "ColorsDemo",
+                entities: [
+                    Entity<Palette>("Palette"),
+                ],
+                versionLock: [
+                    "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f]
+                ]
+            )
+        )
+
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "ColorsDemo.sqlite",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+        )
+        return dataStack
+    }()
+    
+    static let palettes: ListPublisher<Palette> = {
+
+        return ColorsDemo.stack.listPublisher(
+            From<Palette>()
+                .sectionBy(\.colorName)
+                .orderBy(.ascending(\.hue))
+        )
+    }()
+}

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift

@@ -3,80 +3,41 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
 import CoreStore
 
 
-private struct Static {
-    
-    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 Where(true)
-            case .light: return Where("%K >= %@", #keyPath(Palette.brightness), 0.9)
-            case .dark: return Where("%K <= %@", #keyPath(Palette.brightness), 0.4)
-            }
-        }
-    }
-    
-    static var filter = Filter.all {
-        
-        didSet {
-            
-            self.palettes.refetch(self.filter.whereClause())
-        }
-    }
-    
-    static let palettes: ListMonitor<Palette> = {
-        
-        try! CoreStore.addStorageAndWait(
-            SQLiteStore(
-                fileName: "ColorsDemo.sqlite",
-                configuration: "ObservingDemo",
-                localStorageOptions: .recreateStoreOnModelMismatch
-            )
-        )
-        
-        return CoreStore.monitorSectionedList(
-            From<Palette>(),
-            SectionBy(#keyPath(Palette.colorName)),
-            OrderBy(.ascending(#keyPath(Palette.hue)))
-        )
-    }()
-}
-
-
 // MARK: - ListObserverDemoViewController
 
-class ListObserverDemoViewController: UITableViewController, ListSectionObserver {
-    
-    // MARK: NSObject
-    
-    deinit {
-        
-        Static.palettes.removeObserver(self)
+final class ListObserverDemoViewController: UITableViewController {
+
+    // MARK: - EditableDataSource
+
+    final class EditableDataSource: DiffableDataSource.TableView<Palette> {
+
+        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
 
@@ -95,7 +56,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         ]
         
         let filterBarButton = UIBarButtonItem(
-            title: Static.filter.rawValue,
+            title: ColorsDemo.filter.rawValue,
             style: .plain,
             target: self,
             action: #selector(self.filterBarButtonItemTouched(_:))
@@ -106,13 +67,36 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
                 target: self,
                 action: #selector(self.addBarButtonItemTouched(_:))
             ),
+            UIBarButtonItem(
+                barButtonSystemItem: .refresh,
+                target: self,
+                action: #selector(self.shuffleBarButtonItemTouched(_:))
+            ),
             filterBarButton
         ]
         self.filterBarButton = filterBarButton
-        
-        Static.palettes.addObserver(self)
-        
-        self.setTable(enabled: !Static.palettes.isPendingRefetch)
+
+        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?) {
@@ -121,8 +105,8 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         switch (segue.identifier, segue.destination, sender) {
             
-        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
-            destinationViewController.palette = palette
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as ObjectPublisher<Palette>):
+            destinationViewController.setPalette(palette)
             
         default:
             break
@@ -130,30 +114,6 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     }
     
     
-    // MARK: UITableViewDataSource
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        
-        return Static.palettes.numberOfSections()
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        return Static.palettes.numberOfObjectsInSection(section)
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
-        let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell
-        
-        let palette = Static.palettes[indexPath]
-        cell.colorView?.backgroundColor = palette.color
-        cell.label?.text = palette.colorText
-        
-        return cell
-    }
-    
-    
     // MARK: UITableViewDelegate
     
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -162,145 +122,60 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         self.performSegue(
             withIdentifier: "ObjectObserverDemoViewController",
-            sender: Static.palettes[indexPath]
+            sender: ColorsDemo.palettes.snapshot[indexPath]
         )
     }
     
-    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
-        
-        switch editingStyle {
-            
-        case .delete:
-            let palette = Static.palettes[indexPath]
-            CoreStore.beginAsynchronous{ (transaction) -> Void in
-                
-                transaction.delete(palette)
-                transaction.commit { (result) -> Void in }
-            }
-            
-        default:
-            break
-        }
-    }
-    
-    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        
-        return Static.palettes.sectionInfoAtIndex(section).name
-    }
-    
-    
-    // MARK: ListObserver
-    
-    func listMonitorWillChange(_ monitor: ListMonitor<Palette>) {
-        
-        self.tableView.beginUpdates()
-    }
-    
-    func listMonitorDidChange(_ monitor: ListMonitor<Palette>) {
-        
-        self.tableView.endUpdates()
-    }
-    
-    func listMonitorWillRefetch(_ monitor: ListMonitor<Palette>) {
-        
-        self.setTable(enabled: false)
-    }
-    
-    func listMonitorDidRefetch(_ monitor: ListMonitor<Palette>) {
-        
-        self.filterBarButton?.title = Static.filter.rawValue
-        self.tableView.reloadData()
-        self.setTable(enabled: true)
-    }
-    
-    
-    // MARK: ListObjectObserver
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: IndexPath) {
-        
-        self.tableView.insertRows(at: [indexPath], with: .automatic)
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: IndexPath) {
-        
-        self.tableView.deleteRows(at: [indexPath], with: .automatic)
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: IndexPath) {
-        
-        if let cell = self.tableView.cellForRow(at: indexPath) as? PaletteTableViewCell {
-            
-            let palette = Static.palettes[indexPath]
-            cell.colorView?.backgroundColor = palette.color
-            cell.label?.text = palette.colorText
-        }
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
-        
-        self.tableView.deleteRows(at: [fromIndexPath], with: .automatic)
-        self.tableView.insertRows(at: [toIndexPath], with: .automatic)
-    }
-    
-    
-    // MARK: ListSectionObserver
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
-        
-        self.tableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
-    }
-    
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
-        
-        self.tableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
-    }
-    
     
     // MARK: Private
     
     private var filterBarButton: UIBarButtonItem?
+    private var dataSource: DiffableDataSource.TableView<Palette>?
+    
+    deinit {
+        
+        ColorsDemo.palettes.removeObserver(self)
+    }
     
     @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
         
-        CoreStore.beginAsynchronous { (transaction) -> Void in
-            
-            transaction.deleteAll(From<Palette>())
-            transaction.commit()
-        }
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+                
+                try transaction.deleteAll(From<Palette>())
+            },
+            completion: { _ in }
+        )
     }
     
     @IBAction private dynamic func filterBarButtonItemTouched(_ sender: AnyObject?) {
         
-        Static.filter = Static.filter.next()
+        ColorsDemo.filter = ColorsDemo.filter.next()
     }
     
     @IBAction private dynamic func addBarButtonItemTouched(_ sender: AnyObject?) {
         
-        CoreStore.beginAsynchronous { (transaction) -> Void in
-            
-            let palette = transaction.create(Into<Palette>())
-            palette.setInitialValues()
-            
-            transaction.commit()
-        }
-    }
-    
-    private func setTable(enabled: Bool) {
-        
-        UIView.animate(
-            withDuration: 0.2,
-            delay: 0,
-            options: .beginFromCurrentState,
-            animations: { () -> Void in
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
                 
-                if let tableView = self.tableView {
-                    
-                    tableView.alpha = enabled ? 1.0 : 0.5
-                    tableView.isUserInteractionEnabled = enabled
+                let palette = transaction.create(Into<Palette>())
+                palette.setInitialValues(in: transaction)
+            },
+            completion: { _ in }
+        )
+    }
+
+    @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                for palette in try transaction.fetchAll(From<Palette>()) {
+
+                    palette.hue .= Palette.randomHue()
+                    palette.colorName .= nil
                 }
             },
-            completion: nil
+            completion: { _ in }
         )
     }
 }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -14,30 +14,23 @@ import CoreStore
 
 class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
-    var palette: Palette? {
+    func setPalette<O: ObjectRepresentation>(_ newValue: O?) where O.ObjectType == Palette {
         
-        get {
+        guard self.monitor?.object?.objectID() != newValue?.objectID() else {
             
-            return self.monitor?.object
+            return
         }
-        set {
+        if let newValue = newValue {
             
-            guard self.monitor?.object != newValue else {
-                
-                return
-            }
+            self.monitor = newValue.asReadOnly(in: ColorsDemo.stack).map(ColorsDemo.stack.monitorObject(_:))
+        }
+        else {
             
-            if let palette = newValue {
-                
-                self.monitor = CoreStore.monitorObject(palette)
-            }
-            else {
-                
-                self.monitor = nil
-            }
+            self.monitor = nil
         }
     }
     
+    
     // MARK: NSObject
     
     deinit {
@@ -50,22 +43,22 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     required init?(coder aDecoder: NSCoder) {
         
-        if let palette = CoreStore.fetchOne(From<Palette>(), OrderBy(.ascending(#keyPath(Palette.hue)))) {
+        if let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
             
-            self.monitor = CoreStore.monitorObject(palette)
+            self.monitor = ColorsDemo.stack.monitorObject(palette)
         }
         else {
             
-            CoreStore.beginSynchronous { (transaction) -> Void in
-                
-                let palette = transaction.create(Into(Palette.self))
-                palette.setInitialValues()
-                
-                _ = transaction.commitAndWait()
-            }
+            _ = try? ColorsDemo.stack.perform(
+                synchronous: { (transaction) in
+                    
+                    let palette = transaction.create(Into<Palette>())
+                    palette.setInitialValues(in: transaction)
+                }
+            )
             
-            let palette = CoreStore.fetchOne(From<Palette>(), OrderBy(.ascending(#keyPath(Palette.hue))))!
-            self.monitor = CoreStore.monitorObject(palette)
+            let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
+            self.monitor = ColorsDemo.stack.monitorObject(palette)
         }
         
         super.init(coder: aDecoder)
@@ -85,7 +78,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     // MARK: ObjectObserver
     
-    func objectMonitor(_ monitor: ObjectMonitor<Palette>, didUpdateObject object: Palette, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(_ monitor: ObjectMonitor<Palette>, didUpdateObject object: Palette, changedPersistentKeys: Set<KeyPathString>) {
         
         self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys)
     }
@@ -121,54 +114,62 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     @IBAction dynamic func hueSliderValueDidChange(_ sender: AnyObject?) {
         
         let hue = self.hueSlider?.value ?? 0
-        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
-            
-            if let palette = transaction.edit(self?.monitor?.object) {
+        ColorsDemo.stack.perform(
+            asynchronous: { [weak self] (transaction) in
                 
-                palette.hue = Int32(hue)
-                transaction.commit()
-            }
-        }
+                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
-        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
-            
-            if let palette = transaction.edit(self?.monitor?.object) {
+        ColorsDemo.stack.perform(
+            asynchronous: { [weak self] (transaction) in
                 
-                palette.saturation = saturation
-                transaction.commit()
-            }
-        }
+                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
-        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
-            
-            if let palette = transaction.edit(self?.monitor?.object) {
+        ColorsDemo.stack.perform(
+            asynchronous: { [weak self] (transaction) in
                 
-                palette.brightness = brightness
-                transaction.commit()
-            }
-        }
+                if let palette = transaction.edit(self?.monitor?.object) {
+                    
+                    palette.brightness .= brightness
+                }
+            },
+            completion: { _ in }
+        )
     }
     
     @IBAction dynamic func deleteBarButtonTapped(_ sender: AnyObject?) {
         
-        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
-            
-            transaction.delete(self?.monitor?.object)
-            transaction.commit()
-        }
+        ColorsDemo.stack.perform(
+            asynchronous: { [weak self] (transaction) in
+                
+                transaction.delete(self?.monitor?.object)
+            },
+            completion: { _ in }
+        )
     }
     
     func reloadPaletteInfo(_ palette: Palette, changedKeys: Set<String>?) {
         
-        self.colorNameLabel?.text = palette.colorName
+        self.colorNameLabel?.text = palette.colorName.value
         
         let color = palette.color
         self.colorNameLabel?.textColor = color
@@ -176,17 +177,17 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
         
         self.hsbLabel?.text = palette.colorText
         
-        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.hue)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.hue)) == true {
             
-            self.hueSlider?.value = Float(palette.hue)
+            self.hueSlider?.value = Float(palette.hue.value)
         }
-        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.saturation)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.saturation)) == true {
             
-            self.saturationSlider?.value = palette.saturation
+            self.saturationSlider?.value = palette.saturation.value
         }
-        if changedKeys == nil || changedKeys?.contains(#keyPath(Palette.brightness)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.brightness)) == true {
             
-            self.brightnessSlider?.value = palette.brightness
+            self.brightnessSlider?.value = palette.brightness.value
         }
     }
 }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -27,4 +27,33 @@ class ObserversViewController: UIViewController {
         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
+    }
 }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation
@@ -14,64 +14,73 @@ import CoreStore
 
 // MARK: - Palette
 
-class Palette: NSManagedObject {
-
-    @NSManaged var hue: Int32
-    @NSManaged var saturation: Float
-    @NSManaged var brightness: Float
+final class Palette: CoreStoreObject {
     
-    @objc dynamic var colorName: String {
+    let hue = Value.Required<Int>("hue", initial: 0)
+    let saturation = Value.Required<Float>("saturation", initial: 0)
+    let brightness = Value.Required<Float>("brightness", initial: 0)
+    
+    let colorName = Value.Optional<String>(
+        "colorName",
+        isTransient: true,
+        customGetter: Palette.getColorName
+    )
+
+    static func randomHue() -> Int {
+
+        return Int(arc4random_uniform(360))
+    }
+    
+    private static func getColorName(_ partialObject: PartialObject<Palette>) -> String? {
         
-        get {
+        if let colorName = partialObject.primitiveValue(for: { $0.colorName }) {
             
-            let KVCKey = #keyPath(Palette.colorName)
-            if let colorName = self.accessValueForKVCKey(KVCKey) as? String {
-                
-                return colorName
-            }
-            
-            let colorName: String
-            switch self.hue % 360 {
-                
-            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"
-            default: colorName = "Upper Reds"
-            }
-            
-            self.setPrimitiveValue(colorName, forKey: KVCKey)
             return colorName
         }
-        set {
+        
+        let colorName: String
+        switch partialObject.value(for: { $0.hue }) % 360 {
             
-            self.setValue(newValue, forKVCKey: #keyPath(Palette.colorName))
+        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"
+        default: colorName = "Upper Reds"
         }
+        
+        partialObject.setPrimitiveValue(colorName, for: { $0.colorName })
+        return colorName
     }
+}
+
+extension Palette {
     
     var color: UIColor {
         
         return UIColor(
-            hue: CGFloat(self.hue) / 360.0,
-            saturation: CGFloat(self.saturation),
-            brightness: CGFloat(self.brightness),
+            hue: CGFloat(self.hue.value) / 360.0,
+            saturation: CGFloat(self.saturation.value),
+            brightness: CGFloat(self.brightness.value),
             alpha: 1.0
         )
     }
     
     var colorText: String {
         
-        return "H: \(self.hue)˚, S: \(round(self.saturation * 100.0))%, B: \(round(self.brightness * 100.0))%"
-    }
-    
-    func setInitialValues() {
-        
-        self.hue = Int32(arc4random_uniform(360))
-        self.saturation = 1.0
-        self.brightness = Float(arc4random_uniform(70) + 30) / 100.0
+        return "H: \(self.hue.value)˚, S: \(round(self.saturation.value * 100.0))%, B: \(round(self.brightness.value * 100.0))%"
+    }
+}
+
+extension Palette {
+
+    func setInitialValues(in transaction: BaseDataTransaction) {
+
+        self.hue .= Palette.randomHue()
+        self.saturation .= Float(1.0)
+        self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
     }
 }

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift

@@ -0,0 +1,17 @@
+//
+//  PaletteCollectionSectionHeaderView.swift
+//  CoreStoreDemo
+//
+//  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?
+}

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift

@@ -0,0 +1,18 @@
+//
+//  PaletteCollectionViewCell.swift
+//  CoreStoreDemo
+//
+//  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?
+}

CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift

@@ -3,12 +3,15 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
 
-class PaletteTableViewCell: UITableViewCell {
+
+// MARK: - PaletteTableViewCell
+
+final class PaletteTableViewCell: UITableViewCell {
     
     @IBOutlet weak var colorView: UIView?
     @IBOutlet weak var label: UILabel?

CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -16,11 +16,6 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
     
     // MARK: NSObject
     
-    deinit {
-        
-        CoreStore.logger = DefaultLogger()
-    }
-    
     let dataStack = DataStack()
     
     // MARK: UIViewController
@@ -30,13 +25,14 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         super.viewDidLoad()
         
         try! self.dataStack.addStorageAndWait(SQLiteStore(fileName: "emptyStore.sqlite"))
-        CoreStore.logger = self
     }
     
     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.",
@@ -46,6 +42,13 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         self.present(alert, animated: true, completion: nil)
     }
 
+    override func viewDidDisappear(_ animated: Bool) {
+
+        super.viewDidDisappear(animated)
+
+        CoreStoreDefaults.logger = DefaultLogger()
+    }
+
     
     // MARK: CoreStoreLogger
     
@@ -98,10 +101,9 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         switch self.segmentedControl?.selectedSegmentIndex {
             
         case 0?:
-            self.dataStack.beginAsynchronous { (transaction) -> Void in
-                
-                _ = transaction.create(Into<Palette>())
-            }
+            let request = NSFetchRequest<NSFetchRequestResult>()
+            Where<NSManagedObject>(true).applyToFetchRequest(request)
+            Where<NSManagedObject>(false).applyToFetchRequest(request)
             
         case 1?:
             _ = try? dataStack.addStorageAndWait(
@@ -112,10 +114,9 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
             )
             
         case 2?:
-            self.dataStack.beginAsynchronous { (transaction) -> Void in
+            DispatchQueue.global(qos: .background).async {
                 
-                transaction.commit()
-                transaction.commit()
+                _ = try! self.dataStack.fetchOne(From<Place>())
             }
             
         default:

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -46,7 +46,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
         self.present(alert, animated: true, completion: nil)
         
         
-        let modelMetadata = withExtendedLifetime(DataStack(modelName: "MigrationDemo")) {
+        let modelMetadata = withExtendedLifetime(DataStack(xcodeModelName: "MigrationDemo")) {
             (dataStack: DataStack) -> ModelMetadata in
             
             let models = self.models
@@ -60,7 +60,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
             }
             for model in models {
                 
-                if model.version == storeVersion {
+                if model.schemaHistory.currentModelVersion == storeVersion {
                     
                     return model
                 }
@@ -79,7 +79,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
     func listMonitorDidChange(_ monitor: ListMonitor<NSManagedObject>) {
         
         if self.lastSelectedIndexPath == nil,
-            let numberOfObjectsInSection = self.listMonitor?.numberOfObjectsInSection(0),
+            let numberOfObjectsInSection = self.listMonitor?.numberOfObjects(in: 0),
             numberOfObjectsInSection > 0 {
             
             self.tableView?.reloadData()
@@ -91,11 +91,16 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
         }
     }
     
+    func listMonitorDidRefetch(_ monitor: ListMonitor<NSManagedObject>) {
+        
+        self.listMonitorDidChange(monitor)
+    }
+    
     // MARK: UITableViewDataSource
     
     @objc dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
+        return self.listMonitor?.numberOfObjects(in: 0) ?? 0
     }
     
     @objc dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -104,7 +109,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
         
         let dna = (self.listMonitor?[indexPath] as? OrganismProtocol)?.dna.description ?? ""
         cell.dnaLabel?.text = "DNA: \(dna)"
-        cell.mutateButtonHandler = { [weak self] _ -> Void in
+        cell.mutateButtonHandler = { [weak self] () -> Void in
             
             guard let `self` = self,
                 let dataStack = self.dataStack,
@@ -115,16 +120,17 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
             
             self.setSelectedIndexPath(indexPath, scrollToSelection: false)
             self.setEnabled(false)
-            dataStack.beginAsynchronous { [weak self] (transaction) -> Void in
-                
-                let organism = transaction.edit(organism) as! OrganismProtocol
-                organism.mutate()
-                
-                transaction.commit { _ -> Void in
+            dataStack.perform(
+                asynchronous: { (transaction) in
+                    
+                    let organism = transaction.edit(organism) as! OrganismProtocol
+                    organism.mutate()
+                },
+                completion: { [weak self] _ in
                     
                     self?.setEnabled(true)
                 }
-            }
+            )
         }
         return cell
     }
@@ -140,29 +146,47 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
     
     // MARK: Private
     
-    private typealias ModelMetadata = (label: String, version: String, entityType: AnyClass, migrationChain: MigrationChain)
+    private typealias ModelMetadata = (label: String, entityType: NSManagedObject.Type, schemaHistory: SchemaHistory)
     
     private let models: [ModelMetadata] = [
         (
             label: "Model V1",
-            version: "MigrationDemo",
             entityType: OrganismV1.self,
-            migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"]
+            schemaHistory: SchemaHistory(
+                XcodeDataModelSchema.from(
+                    modelName: "MigrationDemo",
+                    migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"]
+                ),
+                migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"]
+            )
         ),
         (
             label: "Model V2",
-            version: "MigrationDemoV2",
             entityType: OrganismV2.self,
-            migrationChain: [
-                "MigrationDemo": "MigrationDemoV2",
-                "MigrationDemoV3": "MigrationDemoV2"
-            ]
+            schemaHistory: SchemaHistory(
+                XcodeDataModelSchema.from(
+                    modelName: "MigrationDemo",
+                    migrationChain: [
+                        "MigrationDemo": "MigrationDemoV2",
+                        "MigrationDemoV3": "MigrationDemoV2"
+                    ]
+                ),
+                migrationChain: [
+                    "MigrationDemo": "MigrationDemoV2",
+                    "MigrationDemoV3": "MigrationDemoV2"
+                ]
+            )
         ),
         (
             label: "Model V3",
-            version: "MigrationDemoV3",
             entityType: OrganismV3.self,
-            migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"]
+            schemaHistory: SchemaHistory(
+                XcodeDataModelSchema.from(
+                    modelName: "MigrationDemo",
+                    migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"]
+                ),
+                migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"]
+            )
         )
     ]
     
@@ -209,21 +233,44 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
     
     private func selectModelVersion(_ model: ModelMetadata) {
         
-        if self.dataStack?.modelVersion == model.version {
+        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(
-            modelName: "MigrationDemo",
-            migrationChain: model.migrationChain
-        )
+        let dataStack = DataStack(schemaHistory: model.schemaHistory)
         
         self.setEnabled(false)
         let progress = dataStack.addStorage(
-            SQLiteStore(fileName: "MigrationDemo.sqlite"),
+            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 {
@@ -239,9 +286,9 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
                 
                 self.set(dataStack: dataStack, model: model, scrollToSelection: true)
                 
-                let count = dataStack.queryValue(
-                    From(model.entityType),
-                    Select<Int>(.count(#keyPath(OrganismV1.dna))))!
+                let count = try! dataStack.queryValue(
+                    From<NSManagedObject>(model.entityType)
+                        .select(Int.self, .count(#keyPath(OrganismV1.dna))))!
                 if count > 0 {
                     
                     self.setEnabled(true)
@@ -250,25 +297,26 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
                     
                     for i: Int64 in 0 ..< 20 {
                         
-                        dataStack.beginAsynchronous { (transaction) -> Void in
-                            
-                            for j: Int64 in 0 ..< 500 {
+                        dataStack.perform(
+                            asynchronous: { (transaction) in
                                 
-                                let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol
-                                organism.dna = (i * 500) + j + 1
-                                organism.mutate()
-                            }
-                            
-                            transaction.commit()
-                        }
+                                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.beginAsynchronous { [weak self] (transaction) -> Void in
-                        
-                        transaction.commit { _ in
-                            
+                    dataStack.perform(
+                        asynchronous: { _ in },
+                        completion: { [weak self] _ in
+                    
                             self?.setEnabled(true)
                         }
-                    }
+                    )
                 }
             }
         )
@@ -311,16 +359,26 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
         
         if let dataStack = dataStack, let model = model {
             
-            self.segmentedControl?.selectedSegmentIndex = self.models.map { $0.version }.index(of: model.version)!
+            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("dna")))
+            let listMonitor = dataStack.monitorList(
+                From(model.entityType),
+                OrderBy<NSManagedObject>(.descending(#keyPath(OrganismV1.dna)))
+            )
             listMonitor.addObserver(self)
             self._listMonitor = listMonitor
             
             if self.lastSelectedIndexPath == nil  {
                 
-                if listMonitor.numberOfObjectsInSection(0) > 0 {
+                if listMonitor.numberOfObjects(in: 0) > 0 {
                     
                     self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: true)
                 }
@@ -328,7 +386,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
         }
         else {
            
-            self.segmentedControl?.selectedSegmentIndex = UISegmentedControlNoSegment
+            self.segmentedControl?.selectedSegmentIndex = UISegmentedControl.noSegment
             self._listMonitor = nil
             self._dataStack = nil
         }

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift

@@ -3,12 +3,12 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation
 
-protocol OrganismProtocol: class {
+protocol OrganismProtocol: AnyObject {
     
     var dna: Int64 { get set }
     

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/07/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import CoreData

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0"?>
 <!DOCTYPE database SYSTEM "file:///System/Library/DTDs/CoreData.dtd">
 
 <database>
@@ -10,7 +10,7 @@
             <plist version="1.0">
                 <dict>
                     <key>NSPersistenceFrameworkVersion</key>
-                    <integer>526</integer>
+                    <integer>754</integer>
                     <key>NSStoreModelVersionHashes</key>
                     <dict>
                         <key>XDDevAttributeMapping</key>

CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11198.3" systemVersion="15F34" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16E195" minimumToolsVersion="Xcode 4.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV3" syncable="YES">
         <attribute name="dna" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasHead" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasTail" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="hasVertebrae" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="numberOfLimbs" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="numberOfLimbs" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" elementID="numberOfFlippers" syncable="YES"/>
     </entity>
     <elements>
         <element name="Organism" positionX="-36" positionY="9" width="128" height="120"/>

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
@@ -17,7 +17,7 @@ private struct Static {
     
     static let facebookStack: DataStack = {
         
-        let dataStack = DataStack(modelName: "StackSetupDemo")
+        let dataStack = DataStack(xcodeModelName: "StackSetupDemo")
         try! dataStack.addStorageAndWait(
             SQLiteStore(
                 fileName: "AccountsDemo_FB_Male.sqlite",
@@ -33,29 +33,29 @@ private struct Static {
             )
         )
         
-        _ = dataStack.beginSynchronous { (transaction) -> Void in
-            
-            transaction.deleteAll(From<UserAccount>())
-            
-            let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
-            account1.accountType = "Facebook"
-            account1.name = "John Smith HCD"
-            account1.friends = 42
-            
-            let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
-            account2.accountType = "Facebook"
-            account2.name = "Jane Doe HCD"
-            account2.friends = 314
-            
-            _ = transaction.commitAndWait()
-        }
+        _ = try? dataStack.perform(
+            synchronous: { (transaction) in
+                
+                try transaction.deleteAll(From<UserAccount>())
+                
+                let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
+                account1.accountType = "Facebook"
+                account1.name = "John Smith HCD"
+                account1.friends = 42
+                
+                let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
+                account2.accountType = "Facebook"
+                account2.name = "Jane Doe HCD"
+                account2.friends = 314
+            }
+        )
         
         return dataStack
     }()
     
     static let twitterStack: DataStack = {
         
-        let dataStack = DataStack(modelName: "StackSetupDemo")
+        let dataStack = DataStack(xcodeModelName: "StackSetupDemo")
         try! dataStack.addStorageAndWait(
             SQLiteStore(
                 fileName: "AccountsDemo_TW_Male.sqlite",
@@ -71,23 +71,22 @@ private struct Static {
             )
         )
         
-        _ = dataStack.beginSynchronous { (transaction) -> Void in
-            
-            transaction.deleteAll(From<UserAccount>())
-            
-            let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
-            account1.accountType = "Twitter"
-            account1.name = "#johnsmith_hcd"
-            account1.friends = 7
-            
-            let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
-            account2.accountType = "Twitter"
-            account2.name = "#janedoe_hcd"
-            account2.friends = 100
-            
-            _ = transaction.commitAndWait()
-        }
-        
+        _ = try? dataStack.perform(
+            synchronous: { (transaction) in
+                
+                try transaction.deleteAll(From<UserAccount>())
+                
+                let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
+                account1.accountType = "Twitter"
+                account1.name = "#johnsmith_hcd"
+                account1.friends = 7
+                
+                let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
+                account2.accountType = "Twitter"
+                account2.name = "#janedoe_hcd"
+                account2.friends = 100
+            }
+        )
         return dataStack
     }()
 }
@@ -100,8 +99,8 @@ private struct Static {
 class StackSetupDemoViewController: UITableViewController {
     
     let accounts = [
-        Static.facebookStack.fetchAll(From(UserAccount.self)) ?? [],
-        Static.twitterStack.fetchAll(From(UserAccount.self)) ?? []
+        try! Static.facebookStack.fetchAll(From<UserAccount>()),
+        try! Static.twitterStack.fetchAll(From<UserAccount>())
     ]
     
     

CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift

@@ -0,0 +1,53 @@
+//
+//  SwiftUIContainerViewController.swift
+//  CoreStoreDemo
+//
+//  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.listPublisher(
+                        From<Palette>()
+                            .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
+    }
+}

CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift

@@ -0,0 +1,184 @@
+//
+//  SwiftUIView.swift
+//  CoreStoreDemo
+//
+//  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<Palette>
+
+    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>()) {
+
+                                        palette.hue .= Palette.randomHue()
+                                        palette.colorName .= nil
+                                    }
+                                },
+                                completion: { _ in }
+                            )
+                        },
+                        label: {
+                            Image(systemName: "goforward")
+                        }
+                    )
+                    .frame(width: 30)
+                    Button(
+                        action: {
+
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
+
+                                    let palette = transaction.create(Into<Palette>())
+                                    palette.setInitialValues(in: transaction)
+                                },
+                                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<Palette>
+
+    var body: some View {
+        HStack {
+            Color(palette.color ?? UIColor.clear)
+                .cornerRadius(5)
+                .frame(width: 30, height: 30, alignment: .leading)
+            Text(palette.colorText ?? "<Deleted>")
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct DetailView: View {
+
+    @Environment(\.dataStack)
+    var dataStack: DataStack
+
+    @ObservedObject
+    var palette: ObjectPublisher<Palette>
+
+    @State var hue: Float = 0
+    @State var saturation: Float = 0
+    @State var brightness: Float = 0
+
+    init(palette: ObjectPublisher<Palette>) {
+
+        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 ?? "<Deleted>")
+                    .navigationBarTitle(Text("Color"))
+                Slider(value: $hue, in: 0.0 ... 359.0 as ClosedRange<Float>)
+                Slider(value: $saturation, in: 0.0 ... 1.0 as ClosedRange<Float>)
+                Slider(value: $brightness, in: 0.0 ... 0.1 as ClosedRange<Float>)
+            }
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct SwiftUIView_Previews: PreviewProvider {
+    
+    static var previews: some View {
+        SwiftUIView(
+            palettes: ColorsDemo.stack.listPublisher(
+                From<Palette>()
+                    .sectionBy(\.colorName)
+                    .orderBy(.ascending(\.hue))
+            )
+        )
+        .environment(\.dataStack, ColorsDemo.stack)
+    }
+}
+
+#endif

CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift

@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import Foundation

CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift

@@ -3,10 +3,11 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //
 
 import UIKit
+import Contacts
 import CoreLocation
 import MapKit
 import AddressBookUI
@@ -14,10 +15,12 @@ import CoreStore
 
 
 private struct Static {
-    
+
+    static let dataStack = DataStack()
+
     static let placeController: ObjectMonitor<Place> = {
         
-        try! CoreStore.addStorageAndWait(
+        try! Static.dataStack.addStorageAndWait(
             SQLiteStore(
                 fileName: "PlaceDemo.sqlite",
                 configuration: "TransactionsDemo",
@@ -25,20 +28,20 @@ private struct Static {
             )
         )
         
-        var place = CoreStore.fetchOne(From<Place>())
+        var place = try! Static.dataStack.fetchOne(From<Place>())
         if place == nil {
             
-            _ = CoreStore.beginSynchronous { (transaction) -> Void in
-                
-                let place = transaction.create(Into<Place>())
-                place.setInitialValues()
-                
-                _ = transaction.commitAndWait()
-            }
-            place = CoreStore.fetchOne(From<Place>())
+            _ = try? Static.dataStack.perform(
+                synchronous: { (transaction) in
+                    
+                    let place = transaction.create(Into<Place>())
+                    place.setInitialValues()
+                }
+            )
+            place = try! Static.dataStack.fetchOne(From<Place>())
         }
         
-        return CoreStore.monitorObject(place!)
+        return Static.dataStack.monitorObject(place!)
     }()
 }
 
@@ -131,7 +134,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
         // none
     }
     
-    func objectMonitor(_ monitor: ObjectMonitor<Place>, didUpdateObject object: Place, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(_ monitor: ObjectMonitor<Place>, didUpdateObject object: Place, changedPersistentKeys: Set<KeyPathString>) {
         
         if let mapView = self.mapView {
             
@@ -169,28 +172,31 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
                 gesture.location(in: mapView),
                 toCoordinateFrom: mapView
             )
-            CoreStore.beginAsynchronous { (transaction) -> Void in
-                
-                let place = transaction.edit(Static.placeController.object)
-                place?.coordinate = coordinate
-                transaction.commit { (_) -> Void in }
-            }
+            Static.dataStack.perform(
+                asynchronous: { (transaction) in
+                    
+                    let place = transaction.edit(Static.placeController.object)
+                    place?.coordinate = coordinate
+                },
+                completion: { _ in }
+            )
         }
     }
     
     @IBAction dynamic func refreshButtonTapped(_ sender: AnyObject?) {
         
-        _ = CoreStore.beginSynchronous { (transaction) -> Void in
-            
-            let place = transaction.edit(Static.placeController.object)
-            place?.setInitialValues()
-            _ = transaction.commitAndWait()
-        }
+        _ = try? Static.dataStack.perform(
+            synchronous: { (transaction) in
+                
+                let place = transaction.edit(Static.placeController.object)
+                place?.setInitialValues()
+            }
+        )
     }
     
     func geocode(place: Place) {
         
-        let transaction = CoreStore.beginUnsafe()
+        let transaction = Static.dataStack.beginUnsafe()
         
         self.geocoder?.cancelGeocode()
         
@@ -200,11 +206,23 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
             CLLocation(latitude: place.latitude, longitude: place.longitude),
             completionHandler: { [weak self] (placemarks, error) -> Void in
                 
-                if let placemark = placemarks?.first, let addressDictionary = placemark.addressDictionary {
+                if let placemark = placemarks?.first, let dictionary = placemark.addressDictionary {
                     
                     let place = transaction.edit(Static.placeController.object)
                     place?.title = placemark.name
-                    place?.subtitle = ABCreateStringWithAddressDictionary(addressDictionary, true)
+                    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 }
                 }
                 

CoreStoreTests/BaseTestCase.swift

@@ -2,7 +2,7 @@
 //  BaseTestCase.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -36,12 +36,11 @@ class BaseTestCase: XCTestCase {
     // MARK: Internal
     
     @nonobjc
-    @discardableResult
-    func prepareStack<T>(configurations: [String?] = [nil], _ closure: (_ dataStack: DataStack) -> T) -> T {
+    func prepareStack(configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) throws -> Void) {
         
         let stack = DataStack(
-            modelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            xcodeModelName: "Model",
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -51,36 +50,63 @@ class BaseTestCase: XCTestCase {
                     SQLiteStore(
                         fileURL: SQLiteStore.defaultRootDirectory
                             .appendingPathComponent(UUID().uuidString)
-                            .appendingPathComponent("\(type(of: self))_\(($0 ?? "-null-")).sqlite"),
+                            .appendingPathComponent("\(Self.self)_\(($0 ?? "-null-")).sqlite"),
                         configuration: $0,
                         localStorageOptions: .recreateStoreOnModelMismatch
                     )
                 )
             }
+            try closure(stack)
         }
         catch let error as NSError {
             
             XCTFail(error.coreStoreDumpString)
         }
-        return closure(stack)
     }
     
     @nonobjc
-    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () -> T) -> T {
+    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () throws -> T) rethrows -> T {
         
-        CoreStore.logger = TestLogger(self.prepareLoggerExpectations(expectations))
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations(expectations))
         defer {
             
             self.checkExpectationsImmediately()
-            CoreStore.logger = TestLogger([:])
+            CoreStoreDefaults.logger = TestLogger([:])
         }
-        return closure()
+        return try closure()
     }
     
     @nonobjc
     func expectLogger(_ expectations: [TestLogger.Expectation: XCTestExpectation]) {
         
-        CoreStore.logger = TestLogger(expectations)
+        CoreStoreDefaults.logger = TestLogger(expectations)
+    }
+
+    @nonobjc
+    func expectError<T>(code: CoreStoreErrorCode, closure: () throws -> T) {
+
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations([.logError]))
+        defer {
+
+            self.checkExpectationsImmediately()
+            CoreStoreDefaults.logger = TestLogger([:])
+        }
+        do {
+
+            _ = try closure()
+        }
+        catch let error as CoreStoreError {
+
+            if error.errorCode == code.rawValue {
+
+                return
+            }
+            XCTFail("Expected error code \(code) different from actual error: \((error as NSError).coreStoreDumpString)")
+        }
+        catch {
+
+            XCTFail("Error not wrapped as \(Internals.typeName(CoreStoreError.self)): \((error as NSError).coreStoreDumpString)")
+        }
     }
     
     @nonobjc
@@ -112,12 +138,12 @@ class BaseTestCase: XCTestCase {
         
         super.setUp()
         self.deleteStores()
-        CoreStore.logger = TestLogger([:])
+        CoreStoreDefaults.logger = TestLogger([:])
     }
     
     override func tearDown() {
         
-        CoreStore.logger = DefaultLogger()
+        CoreStoreDefaults.logger = DefaultLogger()
         self.deleteStores()
         super.tearDown()
     }

CoreStoreTests/BaseTestDataTestCase.swift

@@ -0,0 +1,94 @@
+//
+//  BaseTestDataTestCase.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
+
+@testable
+import CoreStore
+
+
+// MARK: - BaseTestDataTestCase
+
+class BaseTestDataTestCase: BaseTestCase {
+    
+    @nonobjc
+    let dateFormatter: DateFormatter = Internals.with {
+        
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone(identifier: "UTC")
+        formatter.calendar = Calendar(identifier: Calendar.Identifier.gregorian)
+        formatter.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ"
+        return formatter
+    }
+    
+    @nonobjc
+    func prepareTestDataForStack(_ stack: DataStack, configurations: [ModelConfiguration] = [nil]) {
+        
+        try! stack.perform(
+            synchronous: { (transaction) in
+                
+                for (configurationIndex, configuration) in configurations.enumerated() {
+                    
+                    let configurationOrdinal = configurationIndex + 1
+                    if configuration == nil || configuration == "Config1" {
+                        
+                        for idIndex in 1 ... 5 {
+                            
+                            let object = transaction.create(Into<TestEntity1>(configuration))
+                            object.testEntityID = NSNumber(value: (configurationOrdinal * 100) + idIndex)
+                            
+                            object.testNumber = NSNumber(value: idIndex)
+                            object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
+                            object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
+                            object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
+                            
+                            let string = "\(configuration ?? "nil"):TestEntity1:\(idIndex)"
+                            object.testString = string
+                            object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
+                        }
+                    }
+                    if configuration == nil || configuration == "Config2" {
+                        
+                        for idIndex in 1 ... 5 {
+                            
+                            let object = transaction.create(Into<TestEntity2>(configuration))
+                            object.testEntityID = NSNumber(value: (configurationOrdinal * 200) + idIndex)
+                            
+                            object.testNumber = NSNumber(value: idIndex)
+                            object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
+                            object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
+                            object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
+                            
+                            let string = "\(configuration ?? "nil"):TestEntity2:\(idIndex)"
+                            object.testString = string
+                            object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
+                        }
+                    }
+                }
+            }
+        )
+    }
+}

CoreStoreTests/BaseTests/BaseTestDataTestCase.swift

@@ -1,76 +0,0 @@
-//
-//  BaseTestDataTestCase.swift
-//  CoreStore
-//
-//  Created by John Rommel Estropia on 2016/06/11.
-//  Copyright © 2016 John Rommel Estropia. All rights reserved.
-//
-
-import Foundation
-
-@testable
-import CoreStore
-
-
-// MARK: - BaseTestDataTestCase
-
-class BaseTestDataTestCase: BaseTestCase {
-    
-    @nonobjc
-    let dateFormatter: DateFormatter = {
-        
-        let formatter = DateFormatter()
-        formatter.locale = Locale(identifier: "en_US_POSIX")
-        formatter.timeZone = TimeZone(identifier: "UTC")
-        formatter.calendar = Calendar(identifier: Calendar.Identifier.gregorian)
-        formatter.dateFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ"
-        return formatter
-    }()
-    
-    @nonobjc
-    func prepareTestDataForStack(_ stack: DataStack, configurations: [String?] = [nil]) {
-        
-        stack.beginSynchronous { (transaction) in
-            
-            for (configurationIndex, configuration) in configurations.enumerated() {
-                
-                let configurationOrdinal = configurationIndex + 1
-                if configuration == nil || configuration == "Config1" {
-                    
-                    for idIndex in 1 ... 5 {
-                        
-                        let object = transaction.create(Into<TestEntity1>(configuration))
-                        object.testEntityID = NSNumber(value: (configurationOrdinal * 100) + idIndex)
-                        
-                        object.testNumber = NSNumber(value: idIndex)
-                        object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
-                        object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
-                        object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
-                        
-                        let string = "\(configuration ?? "nil"):TestEntity1:\(idIndex)"
-                        object.testString = string
-                        object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
-                    }
-                }
-                if configuration == nil || configuration == "Config2" {
-                    
-                    for idIndex in 1 ... 5 {
-                        
-                        let object = transaction.create(Into<TestEntity2>(configuration))
-                        object.testEntityID = NSNumber(value: (configurationOrdinal * 200) + idIndex)
-                        
-                        object.testNumber = NSNumber(value: idIndex)
-                        object.testDate = self.dateFormatter.date(from: "2000-\(configurationOrdinal)-\(idIndex)T00:00:00Z")
-                        object.testBoolean = NSNumber(value: (idIndex % 2) == 1)
-                        object.testDecimal = NSDecimalNumber(string: "\(idIndex)")
-                        
-                        let string = "\(configuration ?? "nil"):TestEntity2:\(idIndex)"
-                        object.testString = string
-                        object.testData = (string as NSString).data(using: String.Encoding.utf8.rawValue)
-                    }
-                }
-            }
-            _ = transaction.commitAndWait()
-        }
-    }
-}

CoreStoreTests/BridgingTests.h

@@ -2,7 +2,7 @@
 //  BridgingTests.h
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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

CoreStoreTests/BridgingTests.m

@@ -2,7 +2,7 @@
 //  BridgingTests.m
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -163,19 +163,13 @@
 - (void)test_ThatDataStacks_BridgeCorrectly {
     
     CSDataStack *dataStack = [[CSDataStack alloc]
-                              initWithModelName:@"Model"
+                              initWithXcodeModelName:@"Model"
                               bundle:[NSBundle bundleForClass:[self class]]
                               versionChain:nil];
     XCTAssertNotNil(dataStack);
     
-    [CSCoreStore setDefaultStack:dataStack];
-    XCTAssertTrue([dataStack isEqual:[CSCoreStore defaultStack]]);
-}
-
-- (void)test_ThatStorages_BridgeCorrectly {
-    
     NSError *memoryError;
-    CSInMemoryStore *memoryStorage = [CSCoreStore
+    CSInMemoryStore *memoryStorage = [dataStack
                                       addInMemoryStorageAndWait:[CSInMemoryStore new]
                                       error:&memoryError];
     XCTAssertNotNil(memoryStorage);
@@ -186,84 +180,84 @@
     XCTAssertNil(memoryError);
     
     NSError *sqliteError;
-    CSSQLiteStore *sqliteStorage = [CSCoreStore
+    CSSQLiteStore *sqliteStorage = [dataStack
                                     addSQLiteStorageAndWait:[CSSQLiteStore new]
                                     error:&sqliteError];
     XCTAssertNotNil(sqliteStorage);
     XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]);
     XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType);
     XCTAssertNil(sqliteStorage.configuration);
-    XCTAssertEqualObjects(sqliteStorage.storeOptions, @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" } });
+    NSDictionary *storeOptions;
+    if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, *)) {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" },
+                          NSBinaryStoreInsecureDecodingCompatibilityOption: @YES };
+    }
+    else {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }};
+    }
+    XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions);
     XCTAssertNil(sqliteError);
 }
 
 - (void)test_ThatTransactions_BridgeCorrectly {
-    
-    [CSCoreStore
-     setDefaultStack:[[CSDataStack alloc]
-                      initWithModelName:@"Model"
-                      bundle:[NSBundle bundleForClass:[self class]]
-                      versionChain:nil]];
-    [CSCoreStore
+
+    CSDataStack *dataStack = [[CSDataStack alloc]
+                              initWithXcodeModelName:@"Model"
+                              bundle:[NSBundle bundleForClass:[self class]]
+                              versionChain:nil];
+    XCTAssertNotNil(dataStack);
+
+    [dataStack
      addInMemoryStorageAndWait:[CSInMemoryStore new]
      error:nil];
     
     {
-        CSUnsafeDataTransaction *transaction = [CSCoreStore beginUnsafe];
+        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"];
-        [CSCoreStore beginSynchronous:^(CSSynchronousDataTransaction * _Nonnull transaction) {
-            
+        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"];
-        [CSCoreStore beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
+        [dataStack beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
             
             XCTAssertNotNil(transaction);
             XCTAssert([transaction isKindOfClass:[CSAsynchronousDataTransaction class]]);
-            [expectation fulfill];
+            [transaction
+             commitWithSuccess:^{
+                 
+                 [expectation fulfill];
+             }
+             failure:^(CSError *error){
+                 
+                 XCTFail();
+             }];
         }];
     }
     [self waitForExpectationsWithTimeout:10 handler:nil];
 }
-    
-#if TARGET_OS_IOS || TARGET_OS_WATCHOS || TARGET_OS_TV
-
-- (void)test_ThatDataStacks_CanCreateCustomFetchedResultsControllers {
-    
-    [CSCoreStore
-     setDefaultStack:[[CSDataStack alloc]
-                      initWithModelName:@"Model"
-                      bundle:[NSBundle bundleForClass:[self class]]
-                      versionChain:nil]];
-    [CSCoreStore
-     addInMemoryStorageAndWait:[CSInMemoryStore new]
-     error:nil];
-    NSFetchedResultsController *controller =
-    [[CSCoreStore defaultStack]
-     createFetchedResultsControllerFrom:CSFromClass([TestEntity1 class])
-     sectionBy:[CSSectionBy keyPath:CSKeyPath(TestEntity1, testString)]
-     fetchClauses:@[CSWhereFormat(@"%K > %d", CSKeyPath(TestEntity1, testEntityID), 100),
-                    CSOrderByKeys(CSSortAscending(CSKeyPath(TestEntity1, testString)), nil),
-                    CSTweakRequest(^(NSFetchRequest *fetchRequest) { fetchRequest.fetchLimit = 10; })]];
-    
-    XCTAssertNotNil(controller);
-    XCTAssertEqualObjects(controller.fetchRequest.entity.managedObjectClassName, [[TestEntity1 class] description]);
-    XCTAssertEqualObjects(controller.sectionNameKeyPath, CSKeyPath(TestEntity1, testString));
-    XCTAssertEqualObjects(controller.fetchRequest.predicate,
-                          CSWhereFormat(@"%K > %d", CSKeyPath(TestEntity1, testEntityID), 100).predicate);
-    XCTAssertEqualObjects(controller.fetchRequest.sortDescriptors,
-                   CSOrderByKeys(CSSortAscending(CSKeyPath(TestEntity1, testString)), nil).sortDescriptors);
-    XCTAssertEqual(controller.fetchRequest.fetchLimit, 10);
-}
-    
-#endif
 
 @end

CoreStoreTests/ConvenienceTests.swift

@@ -2,7 +2,7 @@
 //  ConvenienceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -27,10 +27,9 @@
 import CoreStore
 
 
-#if os(iOS) || os(watchOS) || os(tvOS)
-
 // MARK: - ConvenienceTests
 
+@available(macOS 10.12, *)
 class ConvenienceTests: BaseTestCase {
     
     @objc
@@ -41,8 +40,8 @@ class ConvenienceTests: BaseTestCase {
             let controller = stack.createFetchedResultsController(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testString)),
-                Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
-                OrderBy(.ascending(#keyPath(TestEntity1.testString))),
+                Where<TestEntity1>("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testString))),
                 Tweak { $0.fetchLimit = 10 }
             )
             XCTAssertEqual(controller.managedObjectContext, stack.mainContext)
@@ -50,11 +49,11 @@ class ConvenienceTests: BaseTestCase {
             XCTAssertEqual(controller.sectionNameKeyPath, #keyPath(TestEntity1.testString))
             XCTAssertEqual(
                 controller.fetchRequest.sortDescriptors!,
-                OrderBy(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
             )
             XCTAssertEqual(
                 controller.fetchRequest.predicate,
-                Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
+                Where<TestEntity1>("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
             )
             XCTAssertEqual(controller.fetchRequest.fetchLimit, 10)
         }
@@ -70,8 +69,8 @@ class ConvenienceTests: BaseTestCase {
                 let controller = transaction.createFetchedResultsController(
                     From<TestEntity1>(),
                     SectionBy(#keyPath(TestEntity1.testString)),
-                    Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
-                    OrderBy(.ascending(#keyPath(TestEntity1.testString))),
+                    Where<TestEntity1>("%@ > %d", #keyPath(TestEntity1.testEntityID), 100),
+                    OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testString))),
                     Tweak { $0.fetchLimit = 10 }
                 )
                 XCTAssertEqual(controller.managedObjectContext, transaction.context)
@@ -79,16 +78,14 @@ class ConvenienceTests: BaseTestCase {
                 XCTAssertEqual(controller.sectionNameKeyPath, #keyPath(TestEntity1.testString))
                 XCTAssertEqual(
                     controller.fetchRequest.sortDescriptors!,
-                    OrderBy(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
+                    OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testString))).sortDescriptors
                 )
                 XCTAssertEqual(
                     controller.fetchRequest.predicate,
-                    Where("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
+                    Where<TestEntity1>("%@ > %d", #keyPath(TestEntity1.testEntityID), 100).predicate
                 )
                 XCTAssertEqual(controller.fetchRequest.fetchLimit, 10)
             }
         }
     }
 }
-
-#endif

CoreStoreTests/DynamicModelTests.swift

@@ -0,0 +1,440 @@
+//
+//  DynamicModelTests.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 XCTest
+
+@testable
+import CoreStore
+
+#if os(macOS)
+    typealias Color = NSColor
+
+#else
+    typealias Color = UIColor
+
+#endif
+
+class Animal: CoreStoreObject {
+    
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<Color>("color")
+}
+
+class Dog: Animal {
+    
+    let nickname = Value.Optional<String>("nickname")
+    let age = Value.Required<Int>("age", initial: 1)
+    let friends = Relationship.ToManyOrdered<Dog>("friends")
+    let friendedBy = Relationship.ToManyUnordered<Dog>("friendedBy", inverse: { $0.friends })
+}
+
+class Person: CoreStoreObject {
+    
+    let title = Value.Required<String>(
+        "title",
+        initial: "Mr.",
+        customSetter: Person.setTitle
+    )
+    
+    let name = Value.Required<String>(
+        "name",
+        initial: "",
+        customSetter: Person.setName
+    )
+    
+    let displayName = Value.Optional<String>(
+        "displayName",
+        isTransient: true,
+        customGetter: Person.getDisplayName(_:),
+        affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
+    )
+
+    let spouse = Relationship.ToOne<Person>("spouse")
+    
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+
+    private let _spouse = Relationship.ToOne<Person>("_spouseInverse", inverse: { $0.spouse })
+
+    
+    private static func setTitle(_ partialObject: PartialObject<Person>, _ newValue: String) {
+        
+        partialObject.setPrimitiveValue(newValue, for: { $0.title })
+        partialObject.setPrimitiveValue(nil, for: { $0.displayName })
+    }
+    
+    private static func setName(_ partialObject: PartialObject<Person>, _ newValue: String) {
+        
+        partialObject.setPrimitiveValue(newValue, for: { $0.name })
+        partialObject.setPrimitiveValue(nil, for: { $0.displayName })
+    }
+    
+    static func getDisplayName(_ partialObject: PartialObject<Person>) -> String? {
+        
+        if let displayName = partialObject.primitiveValue(for: { $0.displayName }) {
+            
+            return displayName
+        }
+        let title = partialObject.value(for: { $0.title })
+        let name = partialObject.value(for: { $0.name })
+        let displayName = "\(title) \(name)"
+        partialObject.setPrimitiveValue(displayName, for: { $0.displayName })
+        return displayName
+    }
+    
+    static func keyPathsAffectingDisplayName() -> Set<String> {
+        
+        return [
+            String(keyPath: \Person.title),
+            String(keyPath: \Person.name)
+        ]
+    }
+}
+
+
+// MARK: - DynamicModelTests
+
+class DynamicModelTests: BaseTestDataTestCase {
+    
+    @objc
+    dynamic func test_ThatDynamicModels_CanBeDeclaredCorrectly() {
+        
+        let dataStack = DataStack(
+            CoreStoreSchema(
+                modelVersion: "V1",
+                entities: [
+                    Entity<Animal>("Animal"),
+                    Entity<Dog>("Dog"),
+                    Entity<Person>("Person")
+                ],
+                versionLock: [
+                    "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
+                    "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
+                    "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
+                ]
+            )
+        )
+        self.prepareStack(dataStack, configurations: [nil]) { (stack) in
+            
+            let k1 = String(keyPath: \Animal.species)
+            XCTAssertEqual(k1, "species")
+
+            let k2 = String(keyPath: \Dog.species)
+            XCTAssertEqual(k2, "species")
+            
+            let k3 = String(keyPath: \Dog.nickname)
+            XCTAssertEqual(k3, "nickname")
+            
+            let updateDone = self.expectation(description: "update-done")
+            let fetchDone = self.expectation(description: "fetch-done")
+            let willSetPriorObserverDone = self.expectation(description: "willSet-observe-prior-done")
+            let willSetNotPriorObserverDone = self.expectation(description: "willSet-observe-notPrior-done")
+            let didSetObserverDone = self.expectation(description: "didSet-observe-done")
+            stack.perform(
+                asynchronous: { (transaction) in
+                    
+                    let animal = transaction.create(Into<Animal>())
+                    XCTAssertEqual(animal.species.value, "Swift")
+                    XCTAssertTrue(type(of: animal.species.value) == String.self)
+                    
+                    animal.species .= "Sparrow"
+                    XCTAssertEqual(animal.species.value, "Sparrow")
+                    
+                    animal.color .= .yellow
+                    XCTAssertEqual(animal.color.value, Color.yellow)
+
+                    for property in Animal.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Animal.species):
+                            XCTAssertTrue(property is ValueContainer<Animal>.Required<String>)
+
+                        case String(keyPath: \Animal.master):
+                            XCTAssertTrue(property is RelationshipContainer<Animal>.ToOne<Person>)
+
+                        case String(keyPath: \Animal.color):
+                            XCTAssertTrue(property is TransformableContainer<Animal>.Optional<Color>)
+
+                        default:
+                            XCTFail("Unknown KeyPath: \"\(property.keyPath)\"")
+                        }
+                    }
+                    
+                    let dog = transaction.create(Into<Dog>())
+                    XCTAssertEqual(dog.species.value, "Swift")
+                    XCTAssertEqual(dog.nickname.value, nil)
+                    XCTAssertEqual(dog.age.value, 1)
+
+                    for property in Dog.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Dog.species):
+                            XCTAssertTrue(property is ValueContainer<Animal>.Required<String>)
+
+                        case String(keyPath: \Dog.master):
+                            XCTAssertTrue(property is RelationshipContainer<Animal>.ToOne<Person>)
+
+                        case String(keyPath: \Dog.color):
+                            XCTAssertTrue(property is TransformableContainer<Animal>.Optional<Color>)
+
+                        case String(keyPath: \Dog.nickname):
+                            XCTAssertTrue(property is ValueContainer<Dog>.Optional<String>)
+
+                        case String(keyPath: \Dog.age):
+                            XCTAssertTrue(property is ValueContainer<Dog>.Required<Int>)
+
+                        case String(keyPath: \Dog.friends):
+                            XCTAssertTrue(property is RelationshipContainer<Dog>.ToManyOrdered<Dog>)
+
+                        case String(keyPath: \Dog.friendedBy):
+                            XCTAssertTrue(property is RelationshipContainer<Dog>.ToManyUnordered<Dog>)
+
+                        default:
+                            XCTFail("Unknown KeyPath: \"\(property.keyPath)\"")
+                        }
+                    }
+
+//                    #if swift(>=5.1)
+//
+//                    let dogKeyPathBuilder = Dog.keyPathBuilder()
+//                    XCTAssertEqual(dogKeyPathBuilder.species.keyPathString, "SELF.species")
+//                    XCTAssertEqual(dogKeyPathBuilder.master.title.keyPathString, "SELF.master.title")
+//                    let a = dogKeyPathBuilder.master
+//                    let b = dogKeyPathBuilder.master.spouse
+//                    let c = dogKeyPathBuilder.master.spouse.pets
+//                    let d = dogKeyPathBuilder.master.spouse.pets.color
+//                    XCTAssertEqual(dogKeyPathBuilder.master.spouse.pets.color.keyPathString, "SELF.master.spouse.pets.color")
+//
+//                    #endif
+
+                    let didSetObserver = dog.species.observe(options: [.new, .old]) { (object, change) in
+
+                        XCTAssertEqual(object, dog)
+                        XCTAssertEqual(change.kind, .setting)
+                        XCTAssertEqual(change.newValue, "Dog")
+                        XCTAssertEqual(change.oldValue, "Swift")
+                        XCTAssertFalse(change.isPrior)
+                        XCTAssertEqual(object.species.value, "Dog")
+                        didSetObserverDone.fulfill()
+                    }
+                    let willSetObserver = dog.species.observe(options: [.new, .old, .prior]) { (object, change) in
+
+                        XCTAssertEqual(object, dog)
+                        XCTAssertEqual(change.kind, .setting)
+                        XCTAssertEqual(change.oldValue, "Swift")
+
+                        if change.isPrior {
+
+                            XCTAssertNil(change.newValue)
+                            XCTAssertEqual(object.species.value, "Swift")
+                            willSetPriorObserverDone.fulfill()
+                        }
+                        else {
+
+                            XCTAssertEqual(change.newValue, "Dog")
+                            XCTAssertEqual(object.species.value, "Dog")
+                            willSetNotPriorObserverDone.fulfill()
+                        }
+                    }
+                    
+                    dog.species .= "Dog"
+                    XCTAssertEqual(dog.species.value, "Dog")
+
+                    didSetObserver.invalidate()
+                    willSetObserver.invalidate()
+                    
+                    dog.nickname .= "Spot"
+                    XCTAssertEqual(dog.nickname.value, "Spot")
+                    
+                    let person = transaction.create(Into<Person>())
+                    XCTAssertTrue(person.pets.value.isEmpty)
+                    
+                    XCTAssertEqual(
+                        person.rawObject!
+                            .runtimeType()
+                            .keyPathsForValuesAffectingValue(forKey: "displayName"),
+                        ["title", "name"]
+                    )
+                    
+                    person.name .= "Joe"
+                    
+                    XCTAssertEqual(person.rawObject!.value(forKey: "name") as! String?, "Joe")
+                    XCTAssertEqual(person.rawObject!.value(forKey: "displayName") as! String?, "Mr. Joe")
+                    
+                    person.rawObject!.setValue("AAAA", forKey: "displayName")
+                    XCTAssertEqual(person.rawObject!.value(forKey: "displayName") as! String?, "AAAA")
+                    
+                    person.name .= "John"
+                    XCTAssertEqual(person.name.value, "John")
+                    XCTAssertEqual(person.displayName.value, "Mr. John") // Custom getter
+                    
+                    let personSnapshot1 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name.value, personSnapshot1.name)
+                    XCTAssertEqual(person.title.value, personSnapshot1.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot1.displayName)
+                    
+                    person.title .= "Sir"
+                    XCTAssertEqual(person.displayName.value, "Sir John")
+                    
+                    XCTAssertEqual(personSnapshot1.name, "John")
+                    XCTAssertEqual(personSnapshot1.title, "Mr.")
+                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
+                    
+                    let personSnapshot2 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name.value, personSnapshot2.name)
+                    XCTAssertEqual(person.title.value, personSnapshot2.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot2.displayName)
+
+                    var personSnapshot3 = personSnapshot2
+                    personSnapshot3.name = "James"
+                    XCTAssertEqual(personSnapshot1.name, "John")
+                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot2.name, "John")
+                    XCTAssertEqual(personSnapshot2.displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot3.name, "James")
+                    XCTAssertEqual(personSnapshot3.displayName, "Sir John")
+
+                    
+                    person.pets.value.insert(dog)
+                    XCTAssertEqual(person.pets.count, 1)
+                    XCTAssertEqual(person.pets.value.first, dog)
+                    XCTAssertEqual(person.pets.value.first?.master.value, person)
+                    XCTAssertEqual(dog.master.value, person)
+                    XCTAssertEqual(dog.master.value?.pets.value.first, dog)
+                },
+                success: { _ in
+                    
+                    updateDone.fulfill()
+                },
+                failure: { _ in
+                    
+                    XCTFail()
+                }
+            )
+            stack.perform(
+                asynchronous: { (transaction) in
+                    
+                    let p1 = Where<Animal>({ $0.species == "Sparrow" })
+                    XCTAssertEqual(p1.predicate, NSPredicate(format: "%K == %@", "species", "Sparrow"))
+                    
+                    let bird = try transaction.fetchOne(From<Animal>(), p1)
+                    XCTAssertNotNil(bird)
+                    XCTAssertEqual(bird!.species.value, "Sparrow")
+                    
+                    let p2 = Where<Dog>({ $0.nickname == "Spot" })
+                    XCTAssertEqual(p2.predicate, NSPredicate(format: "%K == %@", "nickname", "Spot"))
+                    
+                    let dog = try transaction.fetchOne(From<Dog>().where(\.nickname == "Spot"))
+                    XCTAssertNotNil(dog)
+                    XCTAssertEqual(dog!.nickname.value, "Spot")
+                    XCTAssertEqual(dog!.species.value, "Dog")
+                    
+                    let person = try transaction.fetchOne(From<Person>())
+                    XCTAssertNotNil(person)
+                    XCTAssertEqual(person!.pets.value.first, dog)
+                    
+                    let p3 = Where<Dog>({ $0.age == 10 })
+                    XCTAssertEqual(p3.predicate, NSPredicate(format: "%K == %d", "age", 10))
+
+                    let totalAge = try transaction.queryValue(From<Dog>().select(Int.self, .sum(\Dog.age)))
+                    XCTAssertEqual(totalAge, 1)
+                    
+                    _ = try transaction.fetchAll(
+                        From<Dog>()
+                            .where(\Animal.species == "Dog" && \Dog.age == 10)
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>()
+                            .where(\Dog.age == 10 && \Animal.species == "Dog")
+                            .orderBy(.ascending({ $0.species }))
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>(),
+                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>(),
+                        Where<Dog>({ $0.species == "Dog" && $0.age == 10 })
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>(),
+                        Where<Dog>({ $0.age == 10 && $0.species == "Dog" })
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>(),
+                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                    )
+                    _ = try transaction.fetchAll(
+                        From<Dog>(),
+                        (\Dog.age > 10 && \Dog.age <= 15)
+                    )
+                },
+                success: { _ in
+            
+                    fetchDone.fulfill()
+                },
+                failure: { _ in
+                    
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+        }
+    }
+    
+    @objc
+    dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
+        
+        XCTAssertEqual(String(keyPath: \Animal.species), "species")
+        XCTAssertEqual(String(keyPath: \Dog.species), "species")
+    }
+    
+    @nonobjc
+    func prepareStack(_ dataStack: DataStack, configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) -> Void) {
+        
+        do {
+            
+            try configurations.forEach { (configuration) in
+                
+                try dataStack.addStorageAndWait(
+                    SQLiteStore(
+                        fileURL: SQLiteStore.defaultRootDirectory
+                            .appendingPathComponent(UUID().uuidString)
+                            .appendingPathComponent("\(Self.self)_\((configuration ?? "-null-")).sqlite"),
+                        configuration: configuration,
+                        localStorageOptions: .recreateStoreOnModelMismatch
+                    )
+                )
+            }
+        }
+        catch let error as NSError {
+            
+            XCTFail(error.coreStoreDumpString)
+        }
+        closure(dataStack)
+    }
+}

CoreStoreTests/ErrorTests.swift

@@ -2,7 +2,7 @@
 //  ErrorTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -85,16 +85,21 @@ final class ErrorTests: XCTestCase {
         
         let dummyURL = URL(string: "file:///test1/test2.sqlite")!
         
-        let model = NSManagedObjectModel.fromBundle(Bundle(for: type(of: self)), modelName: "Model")
+        let schemaHistory = SchemaHistory(
+            XcodeDataModelSchema.from(
+                modelName: "Model",
+                bundle: Bundle(for: Self.self)
+            )
+        )
         let version = "1.0.0"
         
-        let error = CoreStoreError.mappingModelNotFound(localStoreURL: dummyURL, targetModel: model, targetModelVersion: version)
+        let error = CoreStoreError.mappingModelNotFound(localStoreURL: dummyURL, targetModel: schemaHistory.rawModel, targetModelVersion: version)
         XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
         XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.mappingModelNotFound.rawValue)
         
         let userInfo: NSDictionary = [
             "localStoreURL": dummyURL,
-            "targetModel": model,
+            "targetModel": schemaHistory.rawModel,
             "targetModelVersion": version
         ]
         let objcError = error.bridgeToObjectiveC

CoreStoreTests/FromTests.swift

@@ -2,7 +2,7 @@
 //  FromTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -38,7 +38,7 @@ final class FromTests: BaseTestCase {
         
         do {
             
-            let from = From()
+            let from = From<NSManagedObject>()
             XCTAssert(from.entityClass === NSManagedObject.self)
             XCTAssertNil(from.configurations)
         }
@@ -74,33 +74,31 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -115,102 +113,98 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
-                
+
                 let from = From<TestEntity1>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -225,99 +219,96 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(Set(affectedConfigurations), ["PF_DEFAULT_CONFIGURATION_NAME", "Config1"] as Set)
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
         }
@@ -332,96 +323,94 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config1"])
             }
             do {
                 
                 let from = From<TestEntity1>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>()
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config2"])
             }
             do {
                 
                 let from = From<TestEntity2>("Config1")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = self.expectLogger([.logWarning]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertFalse(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertTrue(affectedConfigurations.isEmpty)
             }
             do {
                 
                 let from = From<TestEntity2>("Config2")
                 
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
+                XCTAssertNotNil(storesFound)
                 XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                 
                 XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                 
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                 XCTAssertEqual(affectedConfigurations, ["Config2"])
             }
         }

CoreStoreTests/GroupByTests.swift

@@ -2,7 +2,7 @@
 //  GroupByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -38,14 +38,14 @@ final class GroupByTests: BaseTestCase {
         
         do {
             
-            let groupBy = GroupBy()
+            let groupBy = GroupBy<NSManagedObject>()
             XCTAssertEqual(groupBy, GroupBy([] as [String]))
             XCTAssertNotEqual(groupBy, GroupBy("key"))
             XCTAssertTrue(groupBy.keyPaths.isEmpty)
         }
         do {
             
-            let groupBy = GroupBy("key1")
+            let groupBy = GroupBy<NSManagedObject>("key1")
             XCTAssertEqual(groupBy, GroupBy("key1"))
             XCTAssertEqual(groupBy, GroupBy(["key1"]))
             XCTAssertNotEqual(groupBy, GroupBy("key2"))
@@ -53,7 +53,7 @@ final class GroupByTests: BaseTestCase {
         }
         do {
             
-            let groupBy = GroupBy("key1", "key2")
+            let groupBy = GroupBy<NSManagedObject>("key1", "key2")
             XCTAssertEqual(groupBy, GroupBy("key1", "key2"))
             XCTAssertEqual(groupBy, GroupBy(["key1", "key2"]))
             XCTAssertNotEqual(groupBy, GroupBy("key2", "key1"))
@@ -66,10 +66,10 @@ final class GroupByTests: BaseTestCase {
         
         self.prepareStack { (dataStack) in
             
-            let groupBy = GroupBy(#keyPath(TestEntity1.testString))
+            let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
             
-            let request = CoreStoreFetchRequest()
-            _ = From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
+            let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+            try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
             groupBy.applyToFetchRequest(request)
             
             XCTAssertNotNil(request.propertiesToGroupBy)

CoreStoreTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CoreStoreTests/IntoTests.swift

@@ -2,7 +2,7 @@
 //  IntoTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -36,7 +36,7 @@ final class IntoTests: XCTestCase {
     @objc
     dynamic func test_ThatIntoClauseConstants_AreCorrect() {
         
-        XCTAssertEqual(Into<NSManagedObject>.defaultConfigurationName, "PF_DEFAULT_CONFIGURATION_NAME")
+        XCTAssertEqual(DataStack.defaultConfigurationName, "PF_DEFAULT_CONFIGURATION_NAME")
     }
     
     @objc
@@ -44,7 +44,7 @@ final class IntoTests: XCTestCase {
         
         do {
             
-            let into = Into()
+            let into = Into<NSManagedObject>()
             XCTAssert(into.entityClass === NSManagedObject.self)
             XCTAssertNil(into.configuration)
             XCTAssertTrue(into.inferStoreIfPossible)
@@ -58,14 +58,7 @@ final class IntoTests: XCTestCase {
         }
         do {
             
-            let into = Into<TestEntity1>()
-            XCTAssert(into.entityClass === TestEntity1.self)
-            XCTAssertNil(into.configuration)
-            XCTAssertTrue(into.inferStoreIfPossible)
-        }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass)
+            let into = Into(TestEntity1.self)
             XCTAssert(into.entityClass === TestEntity1.self)
             XCTAssertNil(into.configuration)
             XCTAssertTrue(into.inferStoreIfPossible)
@@ -84,13 +77,6 @@ final class IntoTests: XCTestCase {
             XCTAssertEqual(into.configuration, "Config1")
             XCTAssertFalse(into.inferStoreIfPossible)
         }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass, "Config1")
-            XCTAssert(into.entityClass === TestEntity1.self)
-            XCTAssertEqual(into.configuration, "Config1")
-            XCTAssertFalse(into.inferStoreIfPossible)
-        }
     }
     
     @objc
@@ -98,43 +84,30 @@ final class IntoTests: XCTestCase {
         
         do {
             
-            let into = Into()
-            XCTAssertEqual(into, Into())
+            let into = Into<NSManagedObject>()
             XCTAssertEqual(into, Into<NSManagedObject>())
-            XCTAssertEqual(into, Into(NSManagedObject.self as AnyClass))
-            XCTAssertFalse(into == Into<TestEntity1>())
+            XCTAssertEqual(into, Into(NSManagedObject.self))
+            XCTAssertNotEqual(into, Into<NSManagedObject>(TestEntity1.self))
             XCTAssertNotEqual(into, Into<NSManagedObject>("Config1"))
         }
         do {
             
             let into = Into<TestEntity1>()
             XCTAssertEqual(into, Into<TestEntity1>())
-            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass))
-            XCTAssertFalse(into == Into<TestEntity2>())
+            XCTAssertEqual(into, Into(TestEntity1.self))
             XCTAssertNotEqual(into, Into<TestEntity1>("Config1"))
         }
         do {
             
-            let into = Into<TestEntity1>()
-            XCTAssertEqual(into, Into<TestEntity1>())
-            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass))
-            XCTAssertFalse(into == Into<TestEntity2>())
-            XCTAssertNotEqual(into, Into<TestEntity1>("Config1"))
-        }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass)
+            let into = Into(TestEntity1.self)
             XCTAssert(into == Into<TestEntity1>())
             XCTAssertEqual(into, Into(TestEntity1.self))
-            XCTAssertFalse(into == Into<TestEntity2>())
             XCTAssertFalse(into == Into<TestEntity1>("Config1"))
         }
         do {
             
             let into = Into<TestEntity1>("Config1")
             XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
-            XCTAssertEqual(into, Into(TestEntity1.self as AnyClass, "Config1"))
-            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
             XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
         }
         do {
@@ -142,16 +115,14 @@ final class IntoTests: XCTestCase {
             let into = Into(TestEntity1.self, "Config1")
             XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
             XCTAssertEqual(into, Into<TestEntity1>("Config1"))
-            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
             XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
         }
         do {
             
-            let into = Into(TestEntity1.self as AnyClass, "Config1")
-            XCTAssert(into == Into<TestEntity1>("Config1"))
+            let into = Into(TestEntity1.self, "Config1")
+            XCTAssertEqual(into, Into<TestEntity1>("Config1"))
             XCTAssertEqual(into, Into(TestEntity1.self, "Config1"))
-            XCTAssertFalse(into == Into<TestEntity2>("Config1"))
-            XCTAssertFalse(into == Into<TestEntity1>("Config2"))
+            XCTAssertNotEqual(into, Into<TestEntity1>("Config2"))
         }
     }
     
@@ -160,45 +131,9 @@ final class IntoTests: XCTestCase {
         
         do {
             
-            let into = Into()
+            let into = Into<NSManagedObject>()
             let objcInto = into.bridgeToObjectiveC
             XCTAssertEqual(into, objcInto.bridgeToSwift)
         }
-        do {
-            
-            let into = Into<TestEntity1>()
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertTrue(into == objcInto.bridgeToSwift)
-        }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass)
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertEqual(into, objcInto.bridgeToSwift)
-        }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass)
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertEqual(into, objcInto.bridgeToSwift)
-        }
-        do {
-            
-            let into = Into<TestEntity1>("Config1")
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertTrue(into == objcInto.bridgeToSwift)
-        }
-        do {
-            
-            let into = Into(TestEntity1.self, "Config1")
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertTrue(into == objcInto.bridgeToSwift)
-        }
-        do {
-            
-            let into = Into(TestEntity1.self as AnyClass, "Config1")
-            let objcInto = into.bridgeToObjectiveC
-            XCTAssertTrue(into == objcInto.bridgeToSwift)
-        }
     }
 }

CoreStoreTests/ListObserverTests.swift

@@ -2,7 +2,7 @@
 //  ListObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,10 +29,9 @@ import XCTest
 import CoreStore
 
 
-#if os(iOS) || os(watchOS) || os(tvOS)
-
 // MARK: - ListObserverTests
 
+@available(macOS 10.12, *)
 class ListObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -44,7 +43,7 @@ class ListObserverTests: BaseTestDataTestCase {
             let monitor = stack.monitorSectionedList(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
-                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
             )
             monitor.addObserver(observer)
             
@@ -55,7 +54,7 @@ class ListObserverTests: BaseTestDataTestCase {
             var events = 0
             
             let willChangeExpectation = self.expectation(
-                forNotification: "listMonitorWillChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -69,7 +68,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didInsertSectionExpectation = self.expectation(
-                forNotification: "listMonitor:didInsertSection:toSectionIndex:",
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -77,7 +76,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     XCTAssertEqual(
                         ((note.userInfo as NSDictionary?) ?? [:]),
                         [
-                            "sectionInfo": monitor.sectionInfoAtIndex(0),
+                            "sectionInfo": monitor.sectionInfo(at: 0),
                             "sectionIndex": 0
                         ] as NSDictionary
                     )
@@ -89,7 +88,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didInsertObjectExpectation = self.expectation(
-                forNotification: "listMonitor:didInsertObject:toIndexPath:",
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -103,8 +102,8 @@ class ListObserverTests: BaseTestDataTestCase {
                     )
                     
                     let indexPath = userInfo?["indexPath"] as? NSIndexPath
-                    XCTAssertEqual(indexPath?.section, 0)
-                    XCTAssertEqual(indexPath?.row, 0)
+                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -121,7 +120,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didChangeExpectation = self.expectation(
-                forNotification: "listMonitorDidChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -134,29 +133,29 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                let object = transaction.create(Into<TestEntity1>())
-                object.testBoolean = NSNumber(value: true)
-                object.testNumber = NSNumber(value: 1)
-                object.testDecimal = NSDecimalNumber(string: "1")
-                object.testString = "nil:TestEntity1:1"
-                object.testData = ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!
-                object.testDate = self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!
-                
-                transaction.commit { (result) in
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
                     
-                    switch result {
-                        
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        saveExpectation.fulfill()
-                        
-                    case .failure:
-                        XCTFail()
-                    }
+                    let object = transaction.create(Into<TestEntity1>())
+                    object.testBoolean = NSNumber(value: true)
+                    object.testNumber = NSNumber(value: 1)
+                    object.testDecimal = NSDecimalNumber(string: "1")
+                    object.testString = "nil:TestEntity1:1"
+                    object.testData = ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                    object.testDate = self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!
+                    
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+                    
+                    XCTFail()
                 }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -172,21 +171,21 @@ class ListObserverTests: BaseTestDataTestCase {
             let monitor = stack.monitorSectionedList(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
-                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
             )
             monitor.addObserver(observer)
             
             XCTAssertTrue(monitor.hasSections())
             XCTAssertEqual(monitor.numberOfSections(), 2)
             XCTAssertTrue(monitor.hasObjects())
-            XCTAssertTrue(monitor.hasObjectsInSection(0))
-            XCTAssertEqual(monitor.numberOfObjectsInSection(0), 2)
-            XCTAssertEqual(monitor.numberOfObjectsInSection(1), 3)
+            XCTAssertTrue(monitor.hasObjects(in: 0))
+            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
+            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
             
             var events = 0
             
             let willChangeExpectation = self.expectation(
-                forNotification: "listMonitorWillChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -199,62 +198,60 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            for _ in 1 ... 2 {
-                
-                let didUpdateObjectExpectation = self.expectation(
-                    forNotification: "listMonitor:didUpdateObject:atIndexPath:",
-                    object: observer,
-                    handler: { (note) -> Bool in
+            
+            let didUpdateObjectExpectation = self.expectation(
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssert(events == 1 || events == 2)
+                    
+                    let userInfo = note.userInfo
+                    XCTAssertNotNil(userInfo)
+                    XCTAssertEqual(
+                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                        ["indexPath", "object"]
+                    )
+                    
+                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                    let object = userInfo?["object"] as? TestEntity1
+                    
+                    switch object?.testEntityID {
                         
-                        XCTAssert(events == 1 || events == 2)
+                    case NSNumber(value: 101)?:
+                        XCTAssertEqual(indexPath?.index(atPosition: 0), 1)
+                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
                         
-                        let userInfo = note.userInfo
-                        XCTAssertNotNil(userInfo)
-                        XCTAssertEqual(
-                            Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-                            ["indexPath", "object"]
-                        )
+                        XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+                        XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
+                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
+                        XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
+                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
                         
-                        let indexPath = userInfo?["indexPath"] as? NSIndexPath
-                        let object = userInfo?["object"] as? TestEntity1
+                    case NSNumber(value: 102)?:
+                        XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
                         
-                        switch object?.testEntityID {
-                            
-                        case NSNumber(value: 101)?:
-                            XCTAssertEqual(indexPath?.section, 1)
-                            XCTAssertEqual(indexPath?.row, 0)
-                            
-                            XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
-                            XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
-                            XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
-                            XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
-                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
-                            
-                        case NSNumber(value: 102)?:
-                            XCTAssertEqual(indexPath?.section, 0)
-                            XCTAssertEqual(indexPath?.row, 0)
-                            
-                            XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
-                            XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
-                            XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
-                            XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
-                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
-                            
-                        default:
-                            XCTFail()
-                        }
-                        defer {
-                            
-                            events += 1
-                        }
-                        return events == 1 || events == 2
+                        XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
+                        XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
+                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
+                        XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
+                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
+                        
+                    default:
+                        XCTFail()
                     }
-                )
-            }
+                    defer {
+                        
+                        events += 1
+                    }
+                    return events == 1 || events == 2
+                }
+            )
             let didChangeExpectation = self.expectation(
-                forNotification: "listMonitorDidChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -268,49 +265,49 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                if let object = transaction.fetchOne(
-                    From<TestEntity1>(),
-                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
                     
-                    object.testNumber = NSNumber(value: 11)
-                    object.testDecimal = NSDecimalNumber(string: "11")
-                    object.testString = "nil:TestEntity1:11"
-                    object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
-                    object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
-                }
-                else {
-                    
-                    XCTFail()
-                }
-                if let object = transaction.fetchOne(
-                    From<TestEntity1>(),
-                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
-                    
-                    object.testNumber = NSNumber(value: 22)
-                    object.testDecimal = NSDecimalNumber(string: "22")
-                    object.testString = "nil:TestEntity1:22"
-                    object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
-                    object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
-                }
-                else {
-                    
-                    XCTFail()
-                }
-                transaction.commit { (result) in
-                    
-                    switch result {
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
                         
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        saveExpectation.fulfill()
+                        object.testNumber = NSNumber(value: 11)
+                        object.testDecimal = NSDecimalNumber(string: "11")
+                        object.testString = "nil:TestEntity1:11"
+                        object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                        object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
+                    }
+                    else {
                         
-                    case .failure:
                         XCTFail()
                     }
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+                        
+                        object.testNumber = NSNumber(value: 22)
+                        object.testDecimal = NSDecimalNumber(string: "22")
+                        object.testString = "nil:TestEntity1:22"
+                        object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                        object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
+                    }
+                    else {
+                        
+                        XCTFail()
+                    }
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+                    
+                    XCTFail()
                 }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -326,14 +323,14 @@ class ListObserverTests: BaseTestDataTestCase {
             let monitor = stack.monitorSectionedList(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
-                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
             )
             monitor.addObserver(observer)
             
             var events = 0
             
             let willChangeExpectation = self.expectation(
-                forNotification: "listMonitorWillChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -347,7 +344,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didMoveObjectExpectation = self.expectation(
-                forNotification: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:",
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -361,12 +358,12 @@ class ListObserverTests: BaseTestDataTestCase {
                     )
                     
                     let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
-                    XCTAssertEqual(fromIndexPath?.section, 0)
-                    XCTAssertEqual(fromIndexPath?.row, 0)
+                    XCTAssertEqual(fromIndexPath?.index(atPosition: 0), 0)
+                    XCTAssertEqual(fromIndexPath?.index(atPosition: 1), 0)
                     
                     let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
-                    XCTAssertEqual(toIndexPath?.section, 1)
-                    XCTAssertEqual(toIndexPath?.row, 1)
+                    XCTAssertEqual(toIndexPath?.index(atPosition: 0), 1)
+                    XCTAssertEqual(toIndexPath?.index(atPosition: 1), 1)
                     
                     let object = userInfo?["object"] as? TestEntity1
                     XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
@@ -380,7 +377,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didChangeExpectation = self.expectation(
-                forNotification: "listMonitorDidChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -394,31 +391,31 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                if let object = transaction.fetchOne(
-                    From<TestEntity1>(),
-                    Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
                     
-                    object.testBoolean = NSNumber(value: true)
-                }
-                else {
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+                        
+                        object.testBoolean = NSNumber(value: true)
+                    }
+                    else {
+                        
+                        XCTFail()
+                    }
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
                     
                     XCTFail()
                 }
-                transaction.commit { (result) in
-                    
-                    switch result {
-                        
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        saveExpectation.fulfill()
-                        
-                    case .failure:
-                        XCTFail()
-                    }
-                }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -434,14 +431,14 @@ class ListObserverTests: BaseTestDataTestCase {
             let monitor = stack.monitorSectionedList(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
-                OrderBy(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
             )
             monitor.addObserver(observer)
             
             var events = 0
             
             let willChangeExpectation = self.expectation(
-                forNotification: "listMonitorWillChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -454,40 +451,37 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            for _ in 1 ... 2 {
-                
-                let didUpdateObjectExpectation = self.expectation(
-                    forNotification: "listMonitor:didDeleteObject:fromIndexPath:",
-                    object: observer,
-                    handler: { (note) -> Bool in
+            let didUpdateObjectExpectation = self.expectation(
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+                object: observer,
+                handler: { (note) -> Bool in
+                    
+                    XCTAssert(events == 1 || events == 2)
+                    
+                    let userInfo = note.userInfo
+                    XCTAssertNotNil(userInfo)
+                    XCTAssertEqual(
+                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+                        ["indexPath", "object"]
+                    )
+                    
+                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+                    
+                    XCTAssertEqual(indexPath?.section, 0)
+                    XCTAssert(indexPath?.index(atPosition: 1) == 0 || indexPath?.index(atPosition: 1) == 1)
+                    
+                    let object = userInfo?["object"] as? TestEntity1
+                    XCTAssertEqual(object?.isDeleted, true)
+                    
+                    defer {
                         
-                        XCTAssert(events == 1 || events == 2)
-                        
-                        let userInfo = note.userInfo
-                        XCTAssertNotNil(userInfo)
-                        XCTAssertEqual(
-                            Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-                            ["indexPath", "object"]
-                        )
-                        
-                        let indexPath = userInfo?["indexPath"] as? NSIndexPath
-                        
-                        XCTAssertEqual(indexPath?.section, 0)
-                        XCTAssert(indexPath?.row == 0 || indexPath?.row == 1)
-                        
-                        let object = userInfo?["object"] as? TestEntity1
-                        XCTAssertEqual(object?.isDeleted, true)
-                        
-                        defer {
-                            
-                            events += 1
-                        }
-                        return events == 1 || events == 2
+                        events += 1
                     }
-                )
-            }
+                    return events == 1 || events == 2
+                }
+            )
             let didDeleteSectionExpectation = self.expectation(
-                forNotification: "listMonitor:didDeleteSection:fromSectionIndex:",
+                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -515,7 +509,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let didChangeExpectation = self.expectation(
-                forNotification: "listMonitorDidChange:",
+                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -529,25 +523,26 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                transaction.deleteAll(
-                    From<TestEntity1>(),
-                    Where(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
-                )
-                transaction.commit { (result) in
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
                     
-                    switch result {
-                        
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        saveExpectation.fulfill()
-                        
-                    case .failure:
-                        XCTFail()
-                    }
+                    let count = try transaction.deleteAll(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
+                    )
+                    XCTAssertEqual(count, 2)
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+                    
+                    XCTFail()
                 }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -556,6 +551,7 @@ class ListObserverTests: BaseTestDataTestCase {
 
 // MARK: TestListObserver
 
+@available(macOS 10.12, *)
 class TestListObserver: ListSectionObserver {
     
     // MARK: ListObserver
@@ -678,5 +674,3 @@ class TestListObserver: ListSectionObserver {
         )
     }
 }
-
-#endif

CoreStoreTests/ListPublisherTests.swift

@@ -0,0 +1,683 @@
+//
+//  ListPublisherTests.swift
+//  CoreStore iOS
+//
+//  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.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - ListPublisherTests
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+class ListPublisherTests: BaseTestDataTestCase {
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveInsertNotifications() {
+
+        self.prepareStack { (stack) in
+
+//            let observer = TestListObserver()
+            let listPublisher = stack.listPublisher(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+//            monitor.addObserver(observer)
+//
+//            XCTAssertFalse(monitor.hasSections())
+//            XCTAssertFalse(monitor.hasObjects())
+//            XCTAssertTrue(monitor.objectsInAllSections().isEmpty)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didInsertSectionExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 1)
+//                    XCTAssertEqual(
+//                        ((note.userInfo as NSDictionary?) ?? [:]),
+//                        [
+//                            "sectionInfo": monitor.sectionInfo(at: 0),
+//                            "sectionIndex": 0
+//                        ] as NSDictionary
+//                    )
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1
+//                }
+//            )
+//            let didInsertObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+//                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//                    XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
+//                    XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "1"))
+//                    XCTAssertEqual(object?.testString, "nil:TestEntity1:1")
+//                    XCTAssertEqual(object?.testData, ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                    XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!)
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 2
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    let object = transaction.create(Into<TestEntity1>())
+                    object.testBoolean = NSNumber(value: true)
+                    object.testNumber = NSNumber(value: 1)
+                    object.testDecimal = NSDecimalNumber(string: "1")
+                    object.testString = "nil:TestEntity1:1"
+                    object.testData = ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                    object.testDate = self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!
+
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(listPublisher, {})
+        }
+    }
+
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveUpdateNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            XCTAssertTrue(monitor.hasSections())
+//            XCTAssertEqual(monitor.numberOfSections(), 2)
+//            XCTAssertTrue(monitor.hasObjects())
+//            XCTAssertTrue(monitor.hasObjects(in: 0))
+//            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
+//            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//
+//            let didUpdateObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssert(events == 1 || events == 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//                    let object = userInfo?["object"] as? TestEntity1
+//
+//                    switch object?.testEntityID {
+//
+//                    case NSNumber(value: 101)?:
+//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 1)
+//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
+//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
+//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
+//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
+//
+//                    case NSNumber(value: 102)?:
+//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
+//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
+//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
+//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
+//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
+//
+//                    default:
+//                        XCTFail()
+//                    }
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1 || events == 2
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 3)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
+//
+//                        object.testNumber = NSNumber(value: 11)
+//                        object.testDecimal = NSDecimalNumber(string: "11")
+//                        object.testString = "nil:TestEntity1:11"
+//                        object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
+//                        object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+//
+//                        object.testNumber = NSNumber(value: 22)
+//                        object.testDecimal = NSDecimalNumber(string: "22")
+//                        object.testString = "nil:TestEntity1:22"
+//                        object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
+//                        object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveMoveNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didMoveObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 1)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["fromIndexPath", "toIndexPath", "object"]
+//                    )
+//
+//                    let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
+//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 0), 0)
+//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 1), 0)
+//
+//                    let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
+//                    XCTAssertEqual(toIndexPath?.index(atPosition: 0), 1)
+//                    XCTAssertEqual(toIndexPath?.index(atPosition: 1), 1)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
+//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 2)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 2
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+//
+//                        object.testBoolean = NSNumber(value: true)
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveDeleteNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didUpdateObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssert(events == 1 || events == 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//
+//                    XCTAssertEqual(indexPath?.section, 0)
+//                    XCTAssert(indexPath?.index(atPosition: 1) == 0 || indexPath?.index(atPosition: 1) == 1)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.isDeleted, true)
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1 || events == 2
+//                }
+//            )
+//            let didDeleteSectionExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 3)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["sectionInfo", "sectionIndex"]
+//                    )
+//
+//                    let sectionInfo = userInfo?["sectionInfo"] as? NSFetchedResultsSectionInfo
+//                    XCTAssertNotNil(sectionInfo)
+//                    XCTAssertEqual(sectionInfo?.name, "0")
+//
+//                    let sectionIndex = userInfo?["sectionIndex"]
+//                    XCTAssertEqual(sectionIndex as? NSNumber, NSNumber(value: 0))
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 4)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 4
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    let count = try transaction.deleteAll(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
+//                    )
+//                    XCTAssertEqual(count, 2)
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//}
+//
+//
+//// MARK: TestListObserver
+//
+//@available(macOS 10.12, *)
+//class TestListObserver: ListSectionObserver {
+//
+//    // MARK: ListObserver
+//
+//    typealias ListEntityType = TestEntity1
+//
+//    func listMonitorWillChange(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorWillChange:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorDidChange(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorDidChange:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorWillRefetch(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorWillRefetch:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorDidRefetch(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorDidRefetch:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//
+//    // MARK: ListObjectObserver
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertObject object: TestEntity1, toIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteObject object: TestEntity1, fromIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didUpdateObject object: TestEntity1, atIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didMoveObject object: TestEntity1, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "fromIndexPath": fromIndexPath,
+//                "toIndexPath": toIndexPath
+//            ]
+//        )
+//    }
+//
+//
+//    // MARK: ListSectionObserver
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
+//            object: self,
+//            userInfo: [
+//                "sectionInfo": sectionInfo,
+//                "sectionIndex": sectionIndex
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
+//            object: self,
+//            userInfo: [
+//                "sectionInfo": sectionInfo,
+//                "sectionIndex": sectionIndex
+//            ]
+//        )
+//    }
+}
+
+#endif
+

CoreStoreTests/MigrationChainTests.swift

@@ -2,7 +2,7 @@
 //  MigrationChainTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -37,8 +37,8 @@ final class MigrationChainTests: XCTestCase {
     dynamic func test_ThatNilMigrationChains_HaveNoVersions() {
         
         let chain: MigrationChain = nil
-        XCTAssertTrue(chain.valid)
-        XCTAssertTrue(chain.empty)
+        XCTAssertTrue(chain.isValid)
+        XCTAssertTrue(chain.isEmpty)
         
         XCTAssertFalse(chain.contains("version1"))
         XCTAssertNil(chain.nextVersionFrom("version1"))
@@ -48,8 +48,8 @@ final class MigrationChainTests: XCTestCase {
     dynamic func test_ThatStringMigrationChains_HaveOneVersion() {
         
         let chain: MigrationChain = "version1"
-        XCTAssertTrue(chain.valid)
-        XCTAssertTrue(chain.empty)
+        XCTAssertTrue(chain.isValid)
+        XCTAssertTrue(chain.isEmpty)
         
         XCTAssertTrue(chain.contains("version1"))
         XCTAssertFalse(chain.contains("version2"))
@@ -62,8 +62,8 @@ final class MigrationChainTests: XCTestCase {
     dynamic func test_ThatArrayMigrationChains_HaveLinearVersions() {
         
         let chain: MigrationChain = ["version1", "version2", "version3", "version4"]
-        XCTAssertTrue(chain.valid)
-        XCTAssertFalse(chain.empty)
+        XCTAssertTrue(chain.isValid)
+        XCTAssertFalse(chain.isEmpty)
         
         XCTAssertTrue(chain.contains("version1"))
         XCTAssertTrue(chain.contains("version2"))
@@ -86,8 +86,8 @@ final class MigrationChainTests: XCTestCase {
             "version2": "version3",
             "version3": "version4"
         ]
-        XCTAssertTrue(chain.valid)
-        XCTAssertFalse(chain.empty)
+        XCTAssertTrue(chain.isValid)
+        XCTAssertFalse(chain.isEmpty)
         
         XCTAssertTrue(chain.contains("version1"))
         XCTAssertTrue(chain.contains("version2"))

CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="10174" systemVersion="15F34" minimumToolsVersion="Xcode 4.3">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="17G2307" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="TestEntity1AAA" representedClassName="CoreStoreTests.TestEntity1" syncable="YES">
-        <attribute name="testBoolean" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="testDate" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="testDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testDecimal" optional="YES" attributeType="Decimal" syncable="YES"/>
-        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="testNumber" optional="YES" attributeType="Integer 32" syncable="YES"/>
+        <attribute name="testNumber" optional="YES" attributeType="Integer 32" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="testToManyUnordered" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToOne" inverseEntity="TestEntity1AAA" syncable="YES"/>
+        <relationship name="testToOne" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToManyUnordered" inverseEntity="TestEntity1AAA" syncable="YES"/>
     </entity>
     <entity name="TestEntity2" representedClassName="CoreStoreTests.TestEntity2" syncable="YES">
-        <attribute name="testBoolean" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="testDate" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="testDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testDecimal" optional="YES" attributeType="Decimal" syncable="YES"/>
-        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="testEntityID" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="testNumber" optional="YES" attributeType="Integer 32" syncable="YES"/>
+        <attribute name="testNumber" optional="YES" attributeType="Integer 32" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="testToManyOrdered" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TestEntity2" inverseName="testToOne" inverseEntity="TestEntity2" syncable="YES"/>
+        <relationship name="testToOne" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TestEntity2" inverseName="testToManyOrdered" inverseEntity="TestEntity2" syncable="YES"/>
     </entity>
     <configuration name="Config1">
         <memberEntity name="TestEntity1AAA"/>
@@ -27,7 +31,7 @@
         <memberEntity name="TestEntity2"/>
     </configuration>
     <elements>
-        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="165"/>
-        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="165"/>
+        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="195"/>
+        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="195"/>
     </elements>
 </model>

CoreStoreTests/ObjectObserverTests.swift

@@ -2,7 +2,7 @@
 //  ObjectObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,10 +29,9 @@ import XCTest
 import CoreStore
 
 
-#if os(iOS) || os(watchOS) || os(tvOS)
-
 // MARK: - ObjectObserverTests
 
+@available(macOS 10.12, *)
 class ObjectObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -42,9 +41,9 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             self.prepareTestDataForStack(stack)
             
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                 From<TestEntity1>(),
-                Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                     
                     XCTFail()
                     return
@@ -59,7 +58,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             var events = 0
             
             let willUpdateExpectation = self.expectation(
-                forNotification: "objectMonitor:willUpdateObject:",
+                forNotification: NSNotification.Name(rawValue: "objectMonitor:willUpdateObject:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -76,7 +75,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
                 }
             )
             let didUpdateExpectation = self.expectation(
-                forNotification: "objectMonitor:didUpdateObject:changedPersistentKeys:",
+                forNotification: NSNotification.Name(rawValue: "objectMonitor:didUpdateObject:changedPersistentKeys:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -105,29 +104,29 @@ class ObjectObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                guard let object = transaction.edit(object) else {
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+                    
+                    guard let object = transaction.edit(object) else {
+                        
+                        XCTFail()
+                        try transaction.cancel()
+                    }
+                    object.testNumber = NSNumber(value: 10)
+                    object.testString = "nil:TestEntity1:10"
+                    
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
                     
                     XCTFail()
-                    return
                 }
-                object.testNumber = NSNumber(value: 10)
-                object.testString = "nil:TestEntity1:10"
-                
-                transaction.commit { (result) in
-                    
-                    switch result {
-                        
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        saveExpectation.fulfill()
-                        
-                    case .failure:
-                        XCTFail()
-                    }
-                }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -139,9 +138,9 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             self.prepareTestDataForStack(stack)
             
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                 From<TestEntity1>(),
-                Where(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                     
                     XCTFail()
                     return
@@ -156,7 +155,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             var events = 0
             
             let didDeleteExpectation = self.expectation(
-                forNotification: "objectMonitor:didDeleteObject:",
+                forNotification: NSNotification.Name(rawValue: "objectMonitor:didDeleteObject:"),
                 object: observer,
                 handler: { (note) -> Bool in
                     
@@ -173,29 +172,29 @@ class ObjectObserverTests: BaseTestDataTestCase {
                 }
             )
             let saveExpectation = self.expectation(description: "save")
-            stack.beginAsynchronous { (transaction) in
-                
-                guard let object = transaction.edit(object) else {
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+                    
+                    guard let object = transaction.edit(object) else {
+                        
+                        XCTFail()
+                        try transaction.cancel()
+                    }
+                    transaction.delete(object)
+                    
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+                    
+                    XCTAssertTrue(hasChanges)
+                    XCTAssertTrue(monitor.isObjectDeleted)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
                     
                     XCTFail()
-                    return
                 }
-                transaction.delete(object)
-                
-                transaction.commit { (result) in
-                    
-                    switch result {
-                        
-                    case .success(let hasChanges):
-                        XCTAssertTrue(hasChanges)
-                        XCTAssertTrue(monitor.isObjectDeleted)
-                        saveExpectation.fulfill()
-                        
-                    case .failure:
-                        XCTFail()
-                    }
-                }
-            }
+            )
             self.waitAndCheckExpectations()
         }
     }
@@ -204,6 +203,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
 
 // MARK: TestObjectObserver
 
+@available(macOS 10.12, *)
 class TestObjectObserver: ObjectObserver {
     
     typealias ObjectEntityType = TestEntity1
@@ -219,7 +219,7 @@ class TestObjectObserver: ObjectObserver {
         )
     }
     
-    func objectMonitor(_ monitor: ObjectMonitor<TestEntity1>, didUpdateObject object: TestEntity1, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(_ monitor: ObjectMonitor<TestEntity1>, didUpdateObject object: TestEntity1, changedPersistentKeys: Set<String>) {
         
         NotificationCenter.default.post(
             name: NSNotification.Name(rawValue: "objectMonitor:didUpdateObject:changedPersistentKeys:"),
@@ -242,5 +242,3 @@ class TestObjectObserver: ObjectObserver {
         )
     }
 }
-
-#endif

CoreStoreTests/OrderByTests.swift

@@ -2,7 +2,7 @@
 //  OrderByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -38,21 +38,21 @@ final class OrderByTests: XCTestCase {
         
         do {
             
-            let orderBy = OrderBy()
-            XCTAssertEqual(orderBy, OrderBy([NSSortDescriptor]()))
-            XCTAssertNotEqual(orderBy, OrderBy(NSSortDescriptor(key: "key", ascending: false)))
+            let orderBy = OrderBy<NSManagedObject>()
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>([NSSortDescriptor]()))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(NSSortDescriptor(key: "key", ascending: false)))
             XCTAssertTrue(orderBy.sortDescriptors.isEmpty)
         }
         do {
             
             let sortDescriptor = NSSortDescriptor(key: "key1", ascending: true)
-            let orderBy = OrderBy(sortDescriptor)
+            let orderBy = OrderBy<NSManagedObject>(sortDescriptor)
             XCTAssertEqual(orderBy, OrderBy(sortDescriptor))
-            XCTAssertEqual(orderBy, OrderBy(.ascending("key1")))
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key2")))
-            XCTAssertNotEqual(orderBy, OrderBy(.descending("key1")))
-            XCTAssertNotEqual(orderBy, OrderBy(NSSortDescriptor(key: "key1", ascending: false)))
-            XCTAssertEqual(orderBy, OrderBy([sortDescriptor]))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.descending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(NSSortDescriptor(key: "key1", ascending: false)))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>([sortDescriptor]))
             XCTAssertEqual(orderBy.sortDescriptors, [sortDescriptor])
         }
         do {
@@ -61,76 +61,76 @@ final class OrderByTests: XCTestCase {
                 NSSortDescriptor(key: "key1", ascending: true),
                 NSSortDescriptor(key: "key2", ascending: false)
             ]
-            let orderBy = OrderBy(sortDescriptors)
-            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
-            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            let orderBy = OrderBy<NSManagedObject>(sortDescriptors)
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2")))
             XCTAssertNotEqual(
                 orderBy,
-                OrderBy(
+                OrderBy<NSManagedObject>(
                     [
                         NSSortDescriptor(key: "key1", ascending: false),
                         NSSortDescriptor(key: "key2", ascending: false)
                     ]
                 )
             )
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key3")))
             XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
         }
         do {
             
-            let orderBy = OrderBy(.ascending("key1"))
+            let orderBy = OrderBy<NSManagedObject>(.ascending("key1"))
             let sortDescriptor = NSSortDescriptor(key: "key1", ascending: true)
-            XCTAssertEqual(orderBy, OrderBy(sortDescriptor))
-            XCTAssertEqual(orderBy, OrderBy(.ascending("key1")))
-            XCTAssertNotEqual(orderBy, OrderBy(.descending("key1")))
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key2")))
-            XCTAssertEqual(orderBy, OrderBy([sortDescriptor]))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(sortDescriptor))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.descending("key1")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key2")))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>([sortDescriptor]))
             XCTAssertEqual(orderBy.sortDescriptors, [sortDescriptor])
         }
         do {
             
-            let orderBy = OrderBy(.ascending("key1"), .descending("key2"))
+            let orderBy = OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2"))
             let sortDescriptors = [
                 NSSortDescriptor(key: "key1", ascending: true),
                 NSSortDescriptor(key: "key2", ascending: false)
             ]
-            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
-            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2")))
             XCTAssertNotEqual(
                 orderBy,
-                OrderBy(
+                OrderBy<NSManagedObject>(
                     [
                         NSSortDescriptor(key: "key1", ascending: false),
                         NSSortDescriptor(key: "key2", ascending: false)
                     ]
                 )
             )
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key3")))
             XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
         }
         do {
             
-            let sortKeys: [SortKey] = [.ascending("key1"), .descending("key2")]
-            let orderBy = OrderBy(sortKeys)
+            let sortKeys: [OrderBy<NSManagedObject>.SortKey] = [.ascending("key1"), .descending("key2")]
+            let orderBy = OrderBy<NSManagedObject>(sortKeys)
             let sortDescriptors = [
                 NSSortDescriptor(key: "key1", ascending: true),
                 NSSortDescriptor(key: "key2", ascending: false)
             ]
-            XCTAssertEqual(orderBy, OrderBy(sortDescriptors))
-            XCTAssertEqual(orderBy, OrderBy(.ascending("key1"), .descending("key2")))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(sortDescriptors))
+            XCTAssertEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2")))
             XCTAssertNotEqual(
                 orderBy,
-                OrderBy(
+                OrderBy<NSManagedObject>(
                     [
                         NSSortDescriptor(key: "key1", ascending: false),
                         NSSortDescriptor(key: "key2", ascending: false)
                     ]
                 )
             )
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .ascending("key2")))
-            XCTAssertNotEqual(orderBy, OrderBy(.ascending("key1"), .descending("key3")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .ascending("key2")))
+            XCTAssertNotEqual(orderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key3")))
             XCTAssertEqual(orderBy.sortDescriptors, sortDescriptors)
         }
     }
@@ -138,15 +138,15 @@ final class OrderByTests: XCTestCase {
     @objc
     dynamic func test_ThatOrderByClauseOperations_ComputeCorrectly() {
         
-        let orderBy1 = OrderBy(.ascending("key1"))
-        let orderBy2 = OrderBy(.descending("key2"))
-        let orderBy3 = OrderBy(.ascending("key3"))
+        let orderBy1 = OrderBy<NSManagedObject>(.ascending("key1"))
+        let orderBy2 = OrderBy<NSManagedObject>(.descending("key2"))
+        let orderBy3 = OrderBy<NSManagedObject>(.ascending("key3"))
         
         do {
             
             let plusOrderBy = orderBy1 + orderBy2 + orderBy3
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2"), .ascending("key3")))
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1")) + OrderBy(.descending("key2"), .ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2"), .ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1")) + OrderBy<NSManagedObject>(.descending("key2"), .ascending("key3")))
             XCTAssertNotEqual(plusOrderBy, orderBy1 + orderBy3 + orderBy2)
             XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1 + orderBy3)
             XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy3 + orderBy1)
@@ -158,14 +158,14 @@ final class OrderByTests: XCTestCase {
             
             var plusOrderBy = orderBy1
             plusOrderBy += orderBy2
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2")))
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1")) + OrderBy(.descending("key2")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1")) + OrderBy<NSManagedObject>(.descending("key2")))
             XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1)
             XCTAssertEqual(plusOrderBy.sortDescriptors, orderBy1.sortDescriptors + orderBy2.sortDescriptors)
             
             plusOrderBy += orderBy3
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2"), .ascending("key3")))
-            XCTAssertEqual(plusOrderBy, OrderBy(.ascending("key1"), .descending("key2")) + OrderBy(.ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2"), .ascending("key3")))
+            XCTAssertEqual(plusOrderBy, OrderBy<NSManagedObject>(.ascending("key1"), .descending("key2")) + OrderBy<NSManagedObject>(.ascending("key3")))
             XCTAssertNotEqual(plusOrderBy, orderBy1 + orderBy3 + orderBy2)
             XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy1 + orderBy3)
             XCTAssertNotEqual(plusOrderBy, orderBy2 + orderBy3 + orderBy1)
@@ -178,8 +178,8 @@ final class OrderByTests: XCTestCase {
     @objc
     dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
         
-        let orderBy = OrderBy(.ascending("key"))
-        let request = CoreStoreFetchRequest()
+        let orderBy = OrderBy<NSManagedObject>(.ascending("key"))
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
         orderBy.applyToFetchRequest(request)
         XCTAssertNotNil(request.sortDescriptors)
         XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)

CoreStoreTests/SectionByTests.swift

@@ -2,7 +2,7 @@
 //  SectionByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,10 +29,9 @@ import XCTest
 import CoreStore
 
 
-#if os(iOS) || os(watchOS) || os(tvOS)
-
 //MARK: - SectionByTests
 
+@available(macOS 10.12, *)
 final class SectionByTests: XCTestCase {
     
     @objc
@@ -40,18 +39,16 @@ final class SectionByTests: XCTestCase {
         
         do {
             
-            let sectionBy = SectionBy("key")
+            let sectionBy = SectionBy<NSManagedObject>("key")
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
             XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key")
         }
         do {
             
-            let sectionBy = SectionBy("key") { $0.flatMap { "\($0):suffix" } }
+            let sectionBy = SectionBy<NSManagedObject>("key") { $0.flatMap { "\($0):suffix" } }
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
             XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key:suffix")
             XCTAssertNil(sectionBy.sectionIndexTransformer(nil))
         }
     }
 }
-
-#endif

CoreStoreTests/SelectTests.swift

@@ -2,7 +2,7 @@
 //  SelectTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -38,7 +38,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term: SelectTerm = "attribute"
+            let term: SelectTerm<NSManagedObject> = "attribute"
             XCTAssertEqual(term, SelectTerm.attribute("attribute"))
             XCTAssertNotEqual(term, SelectTerm.attribute("attribute2"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute"))
@@ -58,7 +58,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.attribute("attribute")
+            let term = SelectTerm<NSManagedObject>.attribute("attribute")
             XCTAssertNotEqual(term, SelectTerm.attribute("attribute2"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute"))
             XCTAssertNotEqual(term, SelectTerm.count("attribute"))
@@ -82,7 +82,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.average("attribute")
+            let term = SelectTerm<NSManagedObject>.average("attribute")
             XCTAssertEqual(term, SelectTerm.average("attribute"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute2"))
@@ -106,7 +106,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.average("attribute", as: "alias")
+            let term = SelectTerm<NSManagedObject>.average("attribute", as: "alias")
             XCTAssertEqual(term, SelectTerm.average("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute", as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.average("attribute2"))
@@ -135,7 +135,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.count("attribute")
+            let term = SelectTerm<NSManagedObject>.count("attribute")
             XCTAssertEqual(term, SelectTerm.count("attribute"))
             XCTAssertNotEqual(term, SelectTerm.count("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.count("attribute2"))
@@ -159,7 +159,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.count("attribute", as: "alias")
+            let term = SelectTerm<NSManagedObject>.count("attribute", as: "alias")
             XCTAssertEqual(term, SelectTerm.count("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.count("attribute", as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.count("attribute2"))
@@ -188,7 +188,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.maximum("attribute")
+            let term = SelectTerm<NSManagedObject>.maximum("attribute")
             XCTAssertEqual(term, SelectTerm.maximum("attribute"))
             XCTAssertNotEqual(term, SelectTerm.maximum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.maximum("attribute2"))
@@ -212,7 +212,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.maximum("attribute", as: "alias")
+            let term = SelectTerm<NSManagedObject>.maximum("attribute", as: "alias")
             XCTAssertEqual(term, SelectTerm.maximum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.maximum("attribute", as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.maximum("attribute2"))
@@ -241,7 +241,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.minimum("attribute")
+            let term = SelectTerm<NSManagedObject>.minimum("attribute")
             XCTAssertEqual(term, SelectTerm.minimum("attribute"))
             XCTAssertNotEqual(term, SelectTerm.minimum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.minimum("attribute2"))
@@ -265,7 +265,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.minimum("attribute", as: "alias")
+            let term = SelectTerm<NSManagedObject>.minimum("attribute", as: "alias")
             XCTAssertEqual(term, SelectTerm.minimum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.minimum("attribute", as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.minimum("attribute2"))
@@ -294,7 +294,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.sum("attribute")
+            let term = SelectTerm<NSManagedObject>.sum("attribute")
             XCTAssertEqual(term, SelectTerm.sum("attribute"))
             XCTAssertNotEqual(term, SelectTerm.sum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.sum("attribute2"))
@@ -318,7 +318,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.sum("attribute", as: "alias")
+            let term = SelectTerm<NSManagedObject>.sum("attribute", as: "alias")
             XCTAssertEqual(term, SelectTerm.sum("attribute", as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.sum("attribute", as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.sum("attribute2"))
@@ -347,7 +347,7 @@ final class SelectTests: XCTestCase {
         
         do {
             
-            let term = SelectTerm.objectID()
+            let term = SelectTerm<NSManagedObject>.objectID()
             XCTAssertEqual(term, SelectTerm.objectID())
             XCTAssertNotEqual(term, SelectTerm.objectID(as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.attribute("attribute"))
@@ -368,7 +368,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let term = SelectTerm.objectID(as: "alias")
+            let term = SelectTerm<NSManagedObject>.objectID(as: "alias")
             XCTAssertEqual(term, SelectTerm.objectID(as: "alias"))
             XCTAssertNotEqual(term, SelectTerm.objectID(as: "alias2"))
             XCTAssertNotEqual(term, SelectTerm.objectID())
@@ -393,12 +393,12 @@ final class SelectTests: XCTestCase {
     @objc
     dynamic func test_ThatSelectClauses_ConfigureCorrectly() {
         
-        let term1 = SelectTerm.attribute("attribute1")
-        let term2 = SelectTerm.attribute("attribute2")
-        let term3 = SelectTerm.attribute("attribute3")
+        let term1 = SelectTerm<NSManagedObject>.attribute("attribute1")
+        let term2 = SelectTerm<NSManagedObject>.attribute("attribute2")
+        let term3 = SelectTerm<NSManagedObject>.attribute("attribute3")
         do {
             
-            let select = Select<Int>(term1, term2, term3)
+            let select = Select<NSManagedObject, Int>(term1, term2, term3)
             XCTAssertEqual(select.selectTerms, [term1, term2, term3])
             XCTAssertNotEqual(select.selectTerms, [term1, term3, term2])
             XCTAssertNotEqual(select.selectTerms, [term2, term1, term3])
@@ -408,7 +408,7 @@ final class SelectTests: XCTestCase {
         }
         do {
             
-            let select = Select<Int>([term1, term2, term3])
+            let select = Select<NSManagedObject, Int>([term1, term2, term3])
             XCTAssertEqual(select.selectTerms, [term1, term2, term3])
             XCTAssertNotEqual(select.selectTerms, [term1, term3, term2])
             XCTAssertNotEqual(select.selectTerms, [term2, term1, term3])

CoreStoreTests/SetupTests.swift

@@ -2,7 +2,7 @@
 //  SetupTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -36,10 +36,14 @@ class SetupTests: BaseTestDataTestCase {
         
         do {
             
-            let model = NSManagedObjectModel.mergedModel(from: [Bundle(for: type(of: self))])!
-            
-            let stack = DataStack(model: model, migrationChain: nil)
-            XCTAssertEqual(stack.coordinator.managedObjectModel, model)
+            let schemaHistory = SchemaHistory(
+                XcodeDataModelSchema.from(
+                    modelName: "Model",
+                    bundle: Bundle(for: Self.self)
+                )
+            )
+            let stack = DataStack(schemaHistory: schemaHistory)
+            XCTAssertEqual(stack.coordinator.managedObjectModel, schemaHistory.rawModel)
             XCTAssertEqual(stack.rootSavingContext.persistentStoreCoordinator, stack.coordinator)
             XCTAssertNil(stack.rootSavingContext.parent)
             XCTAssertFalse(stack.rootSavingContext.isDataStackContext)
@@ -47,32 +51,26 @@ class SetupTests: BaseTestDataTestCase {
             XCTAssertEqual(stack.mainContext.parent, stack.rootSavingContext)
             XCTAssertTrue(stack.mainContext.isDataStackContext)
             XCTAssertFalse(stack.mainContext.isTransactionContext)
-            XCTAssertEqual(stack.model, model)
-            XCTAssertTrue(stack.migrationChain.valid)
-            XCTAssertTrue(stack.migrationChain.empty)
-            XCTAssertTrue(stack.migrationChain.rootVersions.isEmpty)
-            XCTAssertTrue(stack.migrationChain.leafVersions.isEmpty)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
+            XCTAssertEqual(stack.schemaHistory.rawModel, schemaHistory.rawModel)
+            XCTAssertTrue(stack.schemaHistory.migrationChain.isValid)
+            XCTAssertTrue(stack.schemaHistory.migrationChain.isEmpty)
+            XCTAssertTrue(stack.schemaHistory.migrationChain.rootVersions.isEmpty)
+            XCTAssertTrue(stack.schemaHistory.migrationChain.leafVersions.isEmpty)
         }
         do {
             
-            let migrationChain: MigrationChain = ["version1", "version2", "version3"]
+            let migrationChain: MigrationChain = ["version1", "version2", "version3", "Model"]
             
             let stack = self.expectLogger([.logWarning]) {
                 
                 DataStack(
-                    modelName: "Model",
-                    bundle: Bundle(for: type(of: self)),
+                    xcodeModelName: "Model",
+                    bundle: Bundle(for: Self.self),
                     migrationChain: migrationChain
                 )
             }
             XCTAssertEqual(stack.modelVersion, "Model")
-            XCTAssertEqual(stack.migrationChain, migrationChain)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
+            XCTAssertEqual(stack.schemaHistory.migrationChain, migrationChain)
         }
     }
     
@@ -80,8 +78,8 @@ class SetupTests: BaseTestDataTestCase {
     dynamic func test_ThatInMemoryStores_SetupCorrectly() {
         
         let stack = DataStack(
-            modelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            xcodeModelName: "Model",
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -135,8 +133,8 @@ class SetupTests: BaseTestDataTestCase {
     dynamic func test_ThatSQLiteStores_SetupCorrectly() {
         
         let stack = DataStack(
-            modelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            xcodeModelName: "Model",
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -203,14 +201,13 @@ class SetupTests: BaseTestDataTestCase {
             do {
                 
                 let stack = DataStack(
-                    modelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    xcodeModelName: "Model",
+                    bundle: Bundle(for: Self.self)
                 )
                 try! stack.addStorageAndWait(sqliteStore)
                 self.prepareTestDataForStack(stack)
             }
             XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
-            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
             
             return try NSPersistentStoreCoordinator.metadataForPersistentStore(
@@ -223,10 +220,13 @@ class SetupTests: BaseTestDataTestCase {
             
             let metadata = try createStore()
             let stack = DataStack(
-                modelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                xcodeModelName: "Model",
+                bundle: Bundle(for: Self.self)
+            )
+            try sqliteStore.cs_eraseStorageAndWait(
+                metadata: metadata,
+                soureModelHint: stack.schemaHistory.schema(for: metadata)?.rawModel()
             )
-            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: stack.model[metadata])
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
@@ -238,7 +238,7 @@ class SetupTests: BaseTestDataTestCase {
         do {
             
             let metadata = try createStore()
-            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
+            try sqliteStore.cs_eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
@@ -253,12 +253,12 @@ class SetupTests: BaseTestDataTestCase {
     dynamic func test_ThatLegacySQLiteStores_SetupCorrectly() {
         
         let stack = DataStack(
-            modelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            xcodeModelName: "Model",
+            bundle: Bundle(for: Self.self)
         )
         do {
             
-            let sqliteStore = LegacySQLiteStore()
+            let sqliteStore = SQLiteStore.legacy()
             do {
                 
                 try stack.addStorageAndWait(sqliteStore)
@@ -273,7 +273,7 @@ class SetupTests: BaseTestDataTestCase {
         }
         do {
             
-            let sqliteStore = LegacySQLiteStore(
+            let sqliteStore = SQLiteStore.legacy(
                 fileName: "ConfigStore1.sqlite",
                 configuration: "Config1",
                 localStorageOptions: .recreateStoreOnModelMismatch
@@ -292,7 +292,7 @@ class SetupTests: BaseTestDataTestCase {
         }
         do {
             
-            let sqliteStore = LegacySQLiteStore(
+            let sqliteStore = SQLiteStore.legacy(
                 fileName: "ConfigStore2.sqlite",
                 configuration: "Config2",
                 localStorageOptions: .recreateStoreOnModelMismatch
@@ -315,20 +315,26 @@ class SetupTests: BaseTestDataTestCase {
     dynamic func test_ThatLegacySQLiteStores_DeleteFilesCorrectly() {
         
         let fileManager = FileManager.default
-        let sqliteStore = LegacySQLiteStore()
+        let sqliteStore = SQLiteStore.legacy()
         func createStore() throws -> [String: Any] {
             
             do {
                 
                 let stack = DataStack(
-                    modelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    xcodeModelName: "Model",
+                    bundle: Bundle(for: Self.self)
+                )
+                try! stack.addStorageAndWait(
+                    SQLiteStore.legacy(
+                        fileName: sqliteStore.fileURL.lastPathComponent,
+                        configuration: sqliteStore.configuration,
+                        migrationMappingProviders: sqliteStore.migrationMappingProviders,
+                        localStorageOptions: .recreateStoreOnModelMismatch
+                    )
                 )
-                try! stack.addStorageAndWait(sqliteStore)
                 self.prepareTestDataForStack(stack)
             }
             XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
-            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
             
             return try NSPersistentStoreCoordinator.metadataForPersistentStore(
@@ -341,10 +347,13 @@ class SetupTests: BaseTestDataTestCase {
             
             let metadata = try createStore()
             let stack = DataStack(
-                modelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                xcodeModelName: "Model",
+                bundle: Bundle(for: Self.self)
+            )
+            try sqliteStore.cs_eraseStorageAndWait(
+                metadata: metadata,
+                soureModelHint: stack.schemaHistory.schema(for: metadata)?.rawModel()
             )
-            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: stack.model[metadata])
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))
@@ -356,7 +365,7 @@ class SetupTests: BaseTestDataTestCase {
         do {
             
             let metadata = try createStore()
-            try sqliteStore.eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
+            try sqliteStore.cs_eraseStorageAndWait(metadata: metadata, soureModelHint: nil)
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-wal")))
             XCTAssertFalse(fileManager.fileExists(atPath: sqliteStore.fileURL.path.appending("-shm")))

CoreStoreTests/StorageInterfaceTests.swift

@@ -2,7 +2,7 @@
 //  StorageInterfaceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -83,33 +83,64 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
-        XCTAssertEqual(store.mappingModelBundles, Bundle.allBundles)
+        XCTAssertTrue(store.migrationMappingProviders.isEmpty)
         XCTAssertEqual(store.localStorageOptions, .none)
     }
     
     @objc
     dynamic func test_ThatFileURLSQLiteStores_ConfigureCorrectly() {
         
-        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
-            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
+        let fileURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString, isDirectory: false)
             .appendingPathExtension("db")
-        let bundles = [Bundle(for: type(of: self))]
+        let mappingProvider = XcodeSchemaMappingProvider(
+            from: "V1", to: "V2",
+            mappingModelBundle: Bundle(for: Self.self)
+        )
         
         let store = SQLiteStore(
             fileURL: fileURL,
             configuration: "config1",
-            mappingModelBundles: bundles,
+            migrationMappingProviders: [mappingProvider],
             localStorageOptions: .recreateStoreOnModelMismatch
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL, fileURL)
-        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
         XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
     }
     
@@ -117,21 +148,37 @@ final class StorageInterfaceTests: XCTestCase {
     dynamic func test_ThatFileNameSQLiteStores_ConfigureCorrectly() {
         
         let fileName = UUID().uuidString + ".db"
-        let bundles = [Bundle(for: type(of: self))]
-        
+        let mappingProvider = XcodeSchemaMappingProvider(
+            from: "V1", to: "V2",
+            mappingModelBundle: Bundle(for: Self.self)
+        )
         let store = SQLiteStore(
             fileName: fileName,
             configuration: "config1",
-            mappingModelBundles: bundles,
+            migrationMappingProviders: [mappingProvider],
             localStorageOptions: .recreateStoreOnModelMismatch
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
-        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
         XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
     }
     
@@ -152,65 +199,72 @@ final class StorageInterfaceTests: XCTestCase {
             .appendingPathComponent(DataStack.applicationName, isDirectory: false)
             .appendingPathExtension("sqlite")
         
-        XCTAssertEqual(LegacySQLiteStore.defaultRootDirectory, legacyDefaultRootDirectory)
-        XCTAssertEqual(LegacySQLiteStore.defaultFileURL, legacyDefaultFileURL)
+        XCTAssertEqual(SQLiteStore.legacyDefaultRootDirectory, legacyDefaultRootDirectory)
+        XCTAssertEqual(SQLiteStore.legacyDefaultFileURL, legacyDefaultFileURL)
     }
     
     @objc
     dynamic func test_ThatDefaultLegacySQLiteStores_ConfigureCorrectly() {
         
-        let store = LegacySQLiteStore()
+        let store = SQLiteStore.legacy()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
-        XCTAssertEqual(store.fileURL, LegacySQLiteStore.defaultFileURL)
-        XCTAssertEqual(store.mappingModelBundles, Bundle.allBundles)
+        XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL)
+        XCTAssertTrue(store.migrationMappingProviders.isEmpty)
         XCTAssertEqual(store.localStorageOptions, .none)
     }
     
-    @objc
-    dynamic func test_ThatFileURLLegacySQLiteStores_ConfigureCorrectly() {
-        
-        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
-            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
-            .appendingPathExtension("db")
-        let bundles = [Bundle(for: type(of: self))]
-        
-        let store = LegacySQLiteStore(
-            fileURL: fileURL,
-            configuration: "config1",
-            mappingModelBundles: bundles,
-            localStorageOptions: .recreateStoreOnModelMismatch
-        )
-        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
-        XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
-        
-        XCTAssertEqual(store.fileURL, fileURL)
-        XCTAssertEqual(store.mappingModelBundles, bundles)
-        XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
-    }
-    
     @objc
     dynamic func test_ThatFileNameLegacySQLiteStores_ConfigureCorrectly() {
         
         let fileName = UUID().uuidString + ".db"
-        let bundles = [Bundle(for: type(of: self))]
-        
-        let store = LegacySQLiteStore(
+        let mappingProvider = XcodeSchemaMappingProvider(
+            from: "V1", to: "V2",
+            mappingModelBundle: Bundle(for: Self.self)
+        )
+        let store = SQLiteStore.legacy(
             fileName: fileName,
             configuration: "config1",
-            mappingModelBundles: bundles,
+            migrationMappingProviders: [mappingProvider],
             localStorageOptions: .recreateStoreOnModelMismatch
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
         
-        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), LegacySQLiteStore.defaultRootDirectory)
+        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
-        XCTAssertEqual(store.mappingModelBundles, bundles)
+        XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
         XCTAssertEqual(store.localStorageOptions, [.recreateStoreOnModelMismatch])
     }
 }

CoreStoreTests/TestEntity1.swift

@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  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
@@ -36,4 +36,6 @@ class TestEntity1: NSManagedObject {
     @NSManaged var testDecimal: NSDecimalNumber?
     @NSManaged var testData: Data?
     @NSManaged var testNil: String?
+    @NSManaged var testToOne: TestEntity1?
+    @NSManaged var testToManyUnordered: NSSet?
 }

CoreStoreTests/TestEntity2.swift

@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  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
@@ -36,4 +36,6 @@ class TestEntity2: NSManagedObject {
     @NSManaged var testDecimal: NSDecimalNumber?
     @NSManaged var testData: Data?
     @NSManaged var testNil: String?
+    @NSManaged var testToOne: TestEntity2?
+    @NSManaged var testToManyOrdered: NSOrderedSet?
 }

CoreStoreTests/TweakTests.swift

@@ -2,7 +2,7 @@
 //  TweakTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -43,7 +43,7 @@ final class TweakTests: XCTestCase {
             $0.fetchLimit = 200
             $0.predicate = predicate
         }
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
         tweak.applyToFetchRequest(request)
         XCTAssertEqual(request.fetchOffset, 100)
         XCTAssertEqual(request.fetchLimit, 200)

CoreStoreTests/VersionLockTests.swift

@@ -0,0 +1,55 @@
+//
+//  VersionLockTests.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 XCTest
+
+@testable
+import CoreStore
+
+
+//MARK: - VersionLockTests
+
+final class VersionLockTests: XCTestCase {
+
+    @objc
+    dynamic func test_ThatVersionLocksProduceCorrectHashes() {
+        
+        let versionLock: VersionLock = [
+            "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
+            "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
+            "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
+        ]
+        XCTAssertEqual(
+            versionLock.description,
+            """
+            [
+                "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
+                "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
+                "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
+            ]
+            """
+        )
+    }
+}

CoreStoreTests/WhereTests.swift

@@ -2,7 +2,7 @@
 //  WhereTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,61 +29,373 @@ import XCTest
 import CoreStore
 
 
+// MARK: - XCTAssertAllEqual
+
+private func XCTAssertAllEqual<O>(_ whereClauses: Where<O>...) {
+    
+    XCTAssertAllEqual(whereClauses)
+}
+
+private func XCTAssertAllEqual<O>(_ whereClauses: [Where<O>]) {
+    
+    for i in whereClauses.indices {
+        
+        for j in whereClauses.indices where j != i {
+            
+            XCTAssertEqual(whereClauses[i], whereClauses[j])
+        }
+    }
+}
+
+private func XCTAssertAllEqual<D: Equatable>(_ items: D...) {
+
+    for i in items.indices {
+
+        for j in items.indices where j != i {
+
+            XCTAssertEqual(items[i], items[j])
+        }
+    }
+}
+
+
 //MARK: - WhereTests
 
 final class WhereTests: XCTestCase {
     
+    @objc
+    dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
+        
+        XCTAssertAllEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertAllEqual(String(keyPath: \Animal.color), "color")
+    }
+
+    @objc
+    dynamic func test_ThatExpressions_HaveCorrectKeyPaths() {
+
+        do {
+
+            do {
+
+//                let keyPathBuilder = TestEntity1.keyPathBuilder()
+
+//                let kp = \TestEntity1.testToOne
+//                print(keyPathBuilder.testString)
+//                print(keyPathBuilder.testToOne)
+//                print(keyPathBuilder.testToOne.testEntityID)
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testEntityID),
+                    (\TestEntity1.testToOne ~ \.testEntityID).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testEntityID)
+//                    keyPathBuilder.testToOne.testEntityID.keyPathString
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered)
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).description,
+                    String(keyPath: \TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered)
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "master.pets",
+                    (\Animal.master ~ \.pets).description,
+                    String(keyPath: \Animal.master ~ \.pets)
+                )
+                XCTAssertAllEqual(
+                    "master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).description,
+                    String(keyPath: \Animal.master ~ \.pets ~ \.species)
+                )
+                XCTAssertAllEqual(
+                    "master.pets.master",
+                    (\Animal.master ~ \.pets ~ \.master).description,
+                    String(keyPath: \Animal.master ~ \.pets ~ \.master)
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testToManyUnordered) + ".@count",
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).count().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).count())
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered) + ".@count",
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "master.pets.@count",
+                    (\Animal.master ~ \.pets).count().description,
+                    String(keyPath: (\Animal.master ~ \.pets).count())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "ANY " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).any().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).any())
+                )
+                XCTAssertAllEqual(
+                    "ANY " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "ANY master.pets",
+                    (\Animal.master ~ \.pets).any().description,
+                    String(keyPath: (\Animal.master ~ \.pets).any())
+                )
+                XCTAssertAllEqual(
+                    "ANY master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).any().description,
+                    String(keyPath: (\Animal.master ~ \.pets ~ \.species).any())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "ALL " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).all().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).all())
+                )
+                XCTAssertAllEqual(
+                    "ALL " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "ALL master.pets",
+                    (\Animal.master ~ \.pets).all().description,
+                    String(keyPath: (\Animal.master ~ \.pets).all())
+                )
+                XCTAssertAllEqual(
+                    "ALL master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).all().description,
+                    String(keyPath: (\Animal.master ~ \.pets ~ \.species).all())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "NONE " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).none().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).none())
+                )
+                XCTAssertAllEqual(
+                    "NONE " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "NONE master.pets",
+                    (\Animal.master ~ \.pets).none().description,
+                    String(keyPath: (\Animal.master ~ \.pets).none())
+                )
+                XCTAssertAllEqual(
+                    "NONE master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).none().description,
+                    String(keyPath: (\Animal.master ~ \.pets ~ \.species).none())
+                )
+            }
+        }
+    }
+
+    @objc
+    dynamic func test_ThatWhereClauses_CanBeCreatedFromExpressionsCorrectly() {
+
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testString) == dummy
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.name == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToOne ~ \.testString) == dummy
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToOne.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.spouse ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.spouse.name == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let count = 3
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered).count() == count
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToManyUnordered)).@count == %d", count)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets).count() == count
+                let predicate = NSPredicate(format: "master.pets.@count == %d", count)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).any() == dummy
+                let predicate = NSPredicate(format: "ANY \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).any() == dummy
+                let predicate = NSPredicate(format: "ANY master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).all() == dummy
+                let predicate = NSPredicate(format: "ALL \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).all() == dummy
+                let predicate = NSPredicate(format: "ALL master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).none() == dummy
+                let predicate = NSPredicate(format: "NONE \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).none() == dummy
+                let predicate = NSPredicate(format: "NONE master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+    }
+    
     @objc
     dynamic func test_ThatWhereClauses_ConfigureCorrectly() {
         
         do {
             
-            let whereClause = Where()
-            XCTAssertEqual(whereClause, Where(true))
-            XCTAssertNotEqual(whereClause, Where(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            let whereClause = Where<NSManagedObject>()
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(true))
+            XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
         }
         do {
             
-            let whereClause = Where(true)
-            XCTAssertEqual(whereClause, Where())
-            XCTAssertNotEqual(whereClause, Where(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            let whereClause = Where<NSManagedObject>(true)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>())
+            XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
         }
         do {
             
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            let whereClause = Where(predicate)
-            XCTAssertEqual(whereClause, Where(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            let whereClause = Where<NSManagedObject>(predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
-            let whereClause = Where("%K == %@", "key", "value")
+            let whereClause = Where<NSManagedObject>("%K == %@", "key", "value")
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
-            let whereClause = Where("%K == %@", argumentArray: ["key", "value"])
+            let whereClause = Where<NSManagedObject>("%K == %@", argumentArray: ["key", "value"])
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
-            let whereClause = Where("key", isEqualTo: "value")
+            let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
-            let whereClause = Where("key", isMemberOf: ["value1", "value2", "value3"])
+            let whereClause = Where<NSManagedObject>("key", isMemberOf: ["value1", "value2", "value3"])
             let predicate = NSPredicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
-            XCTAssertEqual(whereClause, Where(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
     }
     
@@ -93,211 +405,123 @@ final class WhereTests: XCTestCase {
         do {
             
             let value: Int = 100
-            let whereClause1 = Where("%K == %d", "key", value)
-            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %d", "key", NSNumber(value: value))
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause6 = Where("%K == %@", "key", NSNumber(value: value))
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %d", "key", value),
+                Where<NSManagedObject>("%K == %d", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %d", "key", NSNumber(value: value)),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", NSNumber(value: value)),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: NSNumber(value: value))
+            )
         }
         do {
             
             let value = NSNumber(value: 100)
-            let whereClause1 = Where("%K == %d", "key", value)
-            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %d", "key", value.intValue)
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause6 = Where("%K == %@", "key", value.intValue)
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %d", "key", value),
+                Where<NSManagedObject>("%K == %d", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %d", "key", value.intValue),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", value.intValue),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: value.intValue)
+            )
         }
         do {
             
             let value: Int64 = Int64.max
-            let whereClause1 = Where("%K == %d", "key", value)
-            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %d", "key", NSNumber(value: value))
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause6 = Where("%K == %@", "key", NSNumber(value: value))
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %d", "key", value),
+                Where<NSManagedObject>("%K == %d", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %d", "key", NSNumber(value: value)),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", NSNumber(value: value)),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: NSNumber(value: value))
+            )
         }
         do {
             
             let value = NSNumber(value: Int64.max)
-            let whereClause1 = Where("%K == %d", "key", value)
-            let whereClause2 = Where("%K == %d", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %d", "key", value.int64Value)
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause6 = Where("%K == %@", "key", value.int64Value)
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %d", "key", value),
+                Where<NSManagedObject>("%K == %d", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %d", "key", value.int64Value),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", value.int64Value),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: value.int64Value)
+            )
         }
         do {
             
             let value: String = "value"
-            let whereClause1 = Where("%K == %s", "key", value)
-            let whereClause2 = Where("%K == %s", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %s", "key", NSString(string: value))
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause6 = Where("%K == %@", "key", NSString(string: value))
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %s", "key", value),
+                Where<NSManagedObject>("%K == %s", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %s", "key", NSString(string: value)),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", NSString(string: value)),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: value as NSString),
+                Where<NSManagedObject>("key", isEqualTo: NSString(string: value))
+            )
         }
         do {
             
             let value = NSString(string: "value")
-            let whereClause1 = Where("%K == %s", "key", value)
-            let whereClause2 = Where("%K == %s", "key", value as String)
-            let whereClause3 = Where("%K == %s", "key", value as String as AnyObject)
-            let whereClause4 = Where("%K == %@", "key", value)
-            let whereClause5 = Where("%K == %@", "key", value as String)
-            let whereClause6 = Where("%K == %@", "key", value as String as AnyObject)
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K == %s", "key", value),
+                Where<NSManagedObject>("%K == %s", "key", value as String),
+                Where<NSManagedObject>("%K == %s", "key", value as String as AnyObject),
+                Where<NSManagedObject>("%K == %@", "key", value),
+                Where<NSManagedObject>("%K == %@", "key", value as String),
+                Where<NSManagedObject>("%K == %@", "key", value as String as AnyObject),
+                Where<NSManagedObject>("key", isEqualTo: value),
+                Where<NSManagedObject>("key", isEqualTo: value as String),
+                Where<NSManagedObject>("key", isEqualTo: value as String as NSString)
+            )
         }
         do {
             
             let value: [Int] = [100, 200]
-            let whereClause1 = Where("%K == %@", "key", value)
-            let whereClause2 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %@", "key", value as [AnyObject])
-            let whereClause4 = Where("%K == %@", "key", value as NSArray)
-            let whereClause5 = Where("%K == %@", "key", NSArray(array: value))
-            let whereClause6 = Where("%K == %@", "key", value as AnyObject as! NSArray)
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K IN %@", "key", value),
+                Where<NSManagedObject>("%K IN %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K IN %@", "key", value as [AnyObject]),
+                Where<NSManagedObject>("%K IN %@", "key", value as NSArray),
+                Where<NSManagedObject>("%K IN %@", "key", NSArray(array: value)),
+                Where<NSManagedObject>("%K IN %@", "key", value as AnyObject as! NSArray),
+                Where<NSManagedObject>("key", isMemberOf: value)
+            )
         }
         do {
             
             let value: [Int64] = [Int64.min, 100, Int64.max]
-            let whereClause1 = Where("%K == %@", "key", value)
-            let whereClause2 = Where("%K == %@", "key", value as AnyObject)
-            let whereClause3 = Where("%K == %@", "key", value as [AnyObject])
-            let whereClause4 = Where("%K == %@", "key", value as NSArray)
-            let whereClause5 = Where("%K == %@", "key", NSArray(array: value))
-            let whereClause6 = Where("%K == %@", "key", value as AnyObject as! NSArray)
-            XCTAssertEqual(whereClause1, whereClause2)
-            XCTAssertEqual(whereClause1, whereClause3)
-            XCTAssertEqual(whereClause1, whereClause4)
-            XCTAssertEqual(whereClause1, whereClause5)
-            XCTAssertEqual(whereClause1, whereClause6)
-            XCTAssertEqual(whereClause2, whereClause3)
-            XCTAssertEqual(whereClause2, whereClause4)
-            XCTAssertEqual(whereClause2, whereClause5)
-            XCTAssertEqual(whereClause2, whereClause6)
-            XCTAssertEqual(whereClause3, whereClause4)
-            XCTAssertEqual(whereClause3, whereClause5)
-            XCTAssertEqual(whereClause3, whereClause6)
-            XCTAssertEqual(whereClause4, whereClause5)
-            XCTAssertEqual(whereClause4, whereClause6)
-            XCTAssertEqual(whereClause5, whereClause6)
+            XCTAssertAllEqual(
+                Where<NSManagedObject>("%K IN %@", "key", value),
+                Where<NSManagedObject>("%K IN %@", "key", value as AnyObject),
+                Where<NSManagedObject>("%K IN %@", "key", value as [AnyObject]),
+                Where<NSManagedObject>("%K IN %@", "key", value as NSArray),
+                Where<NSManagedObject>("%K IN %@", "key", NSArray(array: value)),
+                Where<NSManagedObject>("%K IN %@", "key", value as AnyObject as! NSArray),
+                Where<NSManagedObject>("key", isMemberOf: value)
+            )
         }
     }
     
     @objc
     dynamic func test_ThatWhereClauseOperations_ComputeCorrectly() {
         
-        let whereClause1 = Where("key1", isEqualTo: "value1")
-        let whereClause2 = Where("key2", isEqualTo: "value2")
-        let whereClause3 = Where("key3", isEqualTo: "value3")
+        let whereClause1 = Where<NSManagedObject>("key1", isEqualTo: "value1")
+        let whereClause2 = Where<NSManagedObject>("key2", isEqualTo: "value2")
+        let whereClause3 = Where<NSManagedObject>("key3", isEqualTo: "value3")
         
         do {
             
@@ -306,8 +530,8 @@ final class WhereTests: XCTestCase {
                 type: .not,
                 subpredicates: [whereClause1.predicate]
             )
-            XCTAssertEqual(notWhere.predicate, notPredicate)
-            XCTAssertEqual(notWhere, !whereClause1)
+            XCTAssertAllEqual(notWhere.predicate, notPredicate)
+            XCTAssertAllEqual(notWhere, !whereClause1)
         }
         do {
             
@@ -322,8 +546,23 @@ final class WhereTests: XCTestCase {
                     whereClause3.predicate
                 ]
             )
-            XCTAssertEqual(andWhere.predicate, andPredicate)
-            XCTAssertEqual(andWhere, whereClause1 && whereClause2 && whereClause3)
+            XCTAssertAllEqual(andWhere.predicate, andPredicate)
+            XCTAssertAllEqual(andWhere, whereClause1 && whereClause2 && whereClause3)
+        }
+        do {
+            
+            let andWhere = whereClause1 && whereClause2 && whereClause3
+            let noneWhere: Where<NSManagedObject>? = nil
+            let someWhere: Where<NSManagedObject>? = Where<NSManagedObject>("key4", isEqualTo: "value4")
+
+            
+            let finalNoneWhere = andWhere &&? noneWhere
+            let finalSomeWhere = andWhere &&? someWhere
+            let unwrappedFinalSomeWhere = andWhere && someWhere!
+
+        
+            XCTAssertAllEqual(andWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
         }
         do {
             
@@ -338,18 +577,33 @@ final class WhereTests: XCTestCase {
                     whereClause3.predicate
                 ]
             )
-            XCTAssertEqual(orWhere.predicate, orPredicate)
-            XCTAssertEqual(orWhere, whereClause1 || whereClause2 || whereClause3)
+            XCTAssertAllEqual(orWhere.predicate, orPredicate)
+            XCTAssertAllEqual(orWhere, whereClause1 || whereClause2 || whereClause3)
         }
+        do {
+            
+            let orWhere = whereClause1 || whereClause2 || whereClause3
+            let noneWhere: Where<NSManagedObject>? = nil
+            let someWhere: Where<NSManagedObject>? = Where<NSManagedObject>("key4", isEqualTo: "value4")
+            
+            
+            let finalNoneWhere = orWhere &&? noneWhere
+            let finalSomeWhere = orWhere &&? someWhere
+            let unwrappedFinalSomeWhere = orWhere && someWhere!
+            
+            XCTAssertAllEqual(orWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
+        }
+
     }
     
     @objc
     dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
         
-        let whereClause = Where("key", isEqualTo: "value")
-        let request = CoreStoreFetchRequest()
+        let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
         whereClause.applyToFetchRequest(request)
         XCTAssertNotNil(request.predicate)
-        XCTAssertEqual(request.predicate, whereClause.predicate)
+        XCTAssertAllEqual(request.predicate, whereClause.predicate)
     }
 }

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2014 John Rommel Estropia
+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

Package.swift

@@ -1,8 +1,9 @@
+// swift-tools-version:5.0
 //
 //  Package.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -25,21 +26,27 @@
 
 import PackageDescription
 
-let targets: [Target]
-#if os(iOS)
-targets = [Target(name: "CoreStore iOS")]
-#elseif os(OSX)
-targets = [Target(name: "CoreStore OSX")]
-#elseif os(watchOS)
-targets = [Target(name: "CoreStore watchOS")]
-#elseif os(tvOS)
-targets = [Target(name: "CoreStore tvOS")]
-#else
-targets = []
-#endif
-
 let package = Package(
     name: "CoreStore",
-    targets: targets,
-    exclude: ["Carthage", "CoreStoreDemo", "Sources/libA/images"]
+    platforms: [
+           .macOS(.v10_12), .iOS(.v10), .tvOS(.v10), .watchOS(.v3)
+    ],
+    products: [
+        .library(name: "CoreStore", type: .static, targets: ["CoreStore"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "CoreStore",
+            dependencies: [],
+            path: "Sources",
+            exclude: ["CoreStoreBridge.h", "CoreStoreBridge.m"]
+        ),
+        .testTarget(
+            name: "CoreStoreTests",
+            dependencies: ["CoreStore"],
+            path: "CoreStoreTests"
+        )
+    ],
+    swiftLanguageVersions: [.v5_1]
 )

Playground_iOS.playground/Contents.swift

@@ -0,0 +1,79 @@
+import UIKit
+import CoreStore
+import PlaygroundSupport
+
+PlaygroundPage.current.needsIndefiniteExecution = true
+
+/// Model Declaration =====
+class Animal: CoreStoreObject {
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<UIColor>("color", initial: .orange)
+}
+
+class Person: CoreStoreObject {
+    let name = Value.Optional<String>("name")
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+}
+/// =======================
+
+/// Stack setup ===========
+let dataStack = DataStack(
+    CoreStoreSchema(
+        modelVersion: "V1",
+        entities: [
+            Entity<Animal>("Animal"),
+            Entity<Person>("Person")
+        ]
+    )
+)
+dataStack.addStorage(
+    SQLiteStore(fileName: "data.sqlite"),
+    completion: { result in
+
+        switch result {
+
+        case .failure(let error):
+            print(error)
+
+        case .success:
+            /// Transactions ==========
+            dataStack.perform(
+                asynchronous: { transaction in
+
+                    let animal = transaction.create(Into<Animal>())
+                    animal.species .= "Sparrow"
+                    animal.color .= .yellow
+
+                    let person = transaction.create(Into<Person>())
+                    person.name .= "John"
+                    person.pets.value.insert(animal)
+                },
+                completion: { result in
+
+                    switch result {
+
+                    case .failure(let error):
+                        print(error)
+
+                    case .success:
+                        /// Accessing Objects =====
+                        let bird = try! dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
+                        print(bird.species.value)
+                        print(bird.color.value as Any)
+                        print(bird)
+
+                        let owner = bird.master.value!
+                        print(owner.name.value as Any)
+                        print(owner.pets.count)
+                        print(owner)
+                        /// =======================
+                    }
+                }
+            )
+            /// =======================
+        }
+    }
+)
+
+

Playground_iOS.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' executeOnSourceChanges='false'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

Playground_iOS.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+</Workspace>

Playground_iOS.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Playground_macOS.playground/Contents.swift

@@ -0,0 +1,77 @@
+import AppKit
+import CoreStore
+import PlaygroundSupport
+
+PlaygroundPage.current.needsIndefiniteExecution = true
+
+/// Model Declaration =====
+class Animal: CoreStoreObject {
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<NSColor>("color", initial: .orange)
+}
+
+class Person: CoreStoreObject {
+    let name = Value.Optional<String>("name")
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+}
+/// =======================
+
+/// Stack setup ===========
+let dataStack = DataStack(
+    CoreStoreSchema(
+        modelVersion: "V1",
+        entities: [
+            Entity<Animal>("Animal"),
+            Entity<Person>("Person")
+        ]
+    )
+)
+dataStack.addStorage(
+    SQLiteStore(fileName: "data.sqlite"),
+    completion: { result in
+
+        switch result {
+
+        case .failure(let error):
+            print(error)
+
+        case .success:
+            /// Transactions ==========
+            dataStack.perform(
+                asynchronous: { transaction in
+
+                    let animal = transaction.create(Into<Animal>())
+                    animal.species .= "Sparrow"
+                    animal.color .= .yellow
+
+                    let person = transaction.create(Into<Person>())
+                    person.name .= "John"
+                    person.pets.value.insert(animal)
+                },
+                completion: { result in
+
+                    switch result {
+
+                    case .failure(let error):
+                        print(error)
+
+                    case .success:
+                        /// Accessing Objects =====
+                        let bird = try! dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
+                        print(bird.species.value)
+                        print(bird.color.value as Any)
+                        print(bird)
+
+                        let owner = bird.master.value!
+                        print(owner.name.value as Any)
+                        print(owner.pets.count)
+                        print(owner)
+                        /// =======================
+                    }
+                }
+            )
+            /// =======================
+        }
+    }
+)

Playground_macOS.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='macos' executeOnSourceChanges='false'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

Playground_macOS.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>