update Readme banner image

# Conflicts:
#	Sources/ListSnapshot.swift

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [JohnEstropia]

.gitignore

@@ -8,3 +8,9 @@ CoreStore.xcworkspace/xcuserdata
 DerivedData
 *.orig
 build
+Playground_macOS.playground/playground.xcworkspace/xcuserdata
+.swiftpm/xcode/package.xcworkspace/xcuserdata
+.swiftpm/xcode/xcuserdata
+Playground_iOS.playground/playground.xcworkspace/xcuserdata
+LegacyDemo/LegacyDemo.xcodeproj/xcuserdata
+Demo/Demo.xcodeproj/xcuserdata

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

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:CoreStoreDemo.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

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

@@ -2,9 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
-	<true/>
-	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<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,46 +0,0 @@
-language: objective-c
-osx_image: xcode10
-sudo: false
-git:
-  submodules: false
-notifications:
-  email: false
-env:
-  global:
-  - LC_CTYPE=en_US.UTF-8
-  - LANG=en_US.UTF-8
-  matrix:
-    - DESTINATION="arch=x86_64"                         SCHEME="CoreStore OSX"     SDK=macosx10.14          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=iPhone XS"              SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0.1,name=iPhone 8"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.3.1,name=iPhone 7"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=iPhone 7"               SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=4.0,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=Apple TV 4K"            SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"         SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 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.26.0/Carthage.pkg"
-  - sudo installer -pkg "Carthage.pkg" -target /
-  - rm "Carthage.pkg"
-  - npm install ios-sim -g
-  - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8, 11.0"
-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 "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint --quick;
-    fi

CoreStore.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "5.4.0"
-    s.swift_version = "4.2"
+    s.version = "8.0.0"
+    s.swift_version = "5.4"
     s.license = "MIT"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
     s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
@@ -9,14 +9,14 @@ Pod::Spec.new do |s|
     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 = "10.0"
-    s.osx.deployment_target = "10.12"
-    s.watchos.deployment_target = "3.0"
-    s.tvos.deployment_target = "10.0"
+    s.ios.deployment_target = "11.0"
+    s.osx.deployment_target = "10.13"
+    s.watchos.deployment_target = "4.0"
+    s.tvos.deployment_target = "11.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 DEBUG' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine -weak_framework SwiftUI' }
 end

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1200"
    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 = "0930"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,18 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
-               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests iOS"
-               ReferencedContainer = "container:CoreStore.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -69,6 +57,18 @@
             isEnabled = "YES">
          </AdditionalOption>
       </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests iOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -95,8 +95,6 @@
             isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1200"
    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 = "0930"
+   LastUpgradeVersion = "1200"
    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/contents.xcworkspacedata

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "group:Demo/Demo.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:CoreStore.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:CoreStoreDemo/CoreStoreDemo.xcodeproj">
+      location = "group:LegacyDemo/LegacyDemo.xcodeproj">
    </FileRef>
 </Workspace>

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout

@@ -1,53 +0,0 @@
-<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>B6855E48-4B19-4321-B1C7-CB2706E12777</string>
-	<key>IDESourceControlProjectName</key>
-	<string>CoreStoreDemo</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>github.com:JohnEstropia/CoreStore.git</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>github.com:JohnEstropia/GCDKit.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>CoreStoreDemo/CoreStoreDemo.xcodeproj</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>../../..</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../../..Libraries/GCDKit</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>github.com:JohnEstropia/CoreStore.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-			<key>IDESourceControlWCCName</key>
-			<string>CoreStore</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>8B2E522D57154DFA93A06982C36315ECBEA4FA97</string>
-			<key>IDESourceControlWCCName</key>
-			<string>GCDKit</string>
-		</dict>
-	</array>
-</dict>
-</plist>

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint

@@ -1,30 +0,0 @@
-{
-  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
-
-  },
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
-    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
-  },
-  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B6855E48-4B19-4321-B1C7-CB2706E12777",
-  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStoreLibraries\/GCDKit",
-    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore"
-  },
-  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStoreDemo",
-  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
-  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStoreDemo\/CoreStoreDemo.xcodeproj",
-  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/CoreStore.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
-    },
-    {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/GCDKit.git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
-    }
-  ]
-}

CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/HardcoreDataDemo.xccheckout

@@ -1,53 +0,0 @@
-<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
-	<false/>
-	<key>IDESourceControlProjectIdentifier</key>
-	<string>7C5E31AC-5DD0-43DA-A5C6-AF73B4532D86</string>
-	<key>IDESourceControlProjectName</key>
-	<string>project</string>
-	<key>IDESourceControlProjectOriginsDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>github.com:JohnEstropia/HardcoreData.git</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>github.com:JohnEstropia/GCDKit.git</string>
-	</dict>
-	<key>IDESourceControlProjectPath</key>
-	<string>HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace</string>
-	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
-	<dict>
-		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
-		<string>../../..</string>
-		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../../..Libraries/GCDKit</string>
-	</dict>
-	<key>IDESourceControlProjectURL</key>
-	<string>github.com:JohnEstropia/HardcoreData.git</string>
-	<key>IDESourceControlProjectVersion</key>
-	<integer>111</integer>
-	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-	<key>IDESourceControlProjectWCConfigurations</key>
-	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>8B2E522D57154DFA93A06982C36315ECBEA4FA97</string>
-			<key>IDESourceControlWCCName</key>
-			<string>GCDKit</string>
-		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>4B60F1BCB491FF717C56441AE7783C74F417BE48</string>
-			<key>IDESourceControlWCCName</key>
-			<string>HardcoreData</string>
-		</dict>
-	</array>
-</dict>
-</plist>

CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib.orig

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<<<<<<< Updated upstream
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
-=======
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
->>>>>>> Stashed changes
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-<<<<<<< Updated upstream
-                <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 (c) 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.5" width="441" height="20.5"/>
->>>>>>> Stashed changes
-                    <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"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <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="133" width="441" 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"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <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"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>

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

@@ -1,347 +0,0 @@
-//
-//  ListObserverDemoViewController.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2018 John Rommel Estropia. All rights reserved.
-//
-
-import UIKit
-import CoreStore
-
-
-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 {
-            
-            self.palettes.refetch(
-                self.filter.whereClause(),
-                OrderBy<Palette>(.ascending(\.hue))
-            )
-        }
-    }
-    
-    static let stack: DataStack = {
-     
-        return DataStack(
-            CoreStoreSchema(
-                modelVersion: "ColorsDemo",
-                entities: [
-                    Entity<Palette>("Palette"),
-                ],
-                versionLock: [
-                    "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f]
-                ]
-            )
-        )
-    }()
-    
-    static let palettes: ListMonitor<Palette> = {
-        
-        try! ColorsDemo.stack.addStorageAndWait(
-            SQLiteStore(
-                fileName: "ColorsDemo.sqlite",
-                localStorageOptions: .recreateStoreOnModelMismatch
-            )
-        )
-        return ColorsDemo.stack.monitorSectionedList(
-            From<Palette>()
-                .sectionBy(\.colorName)
-                .orderBy(.ascending(\.hue))
-        )
-    }()
-}
-
-
-// MARK: - ListObserverDemoViewController
-
-class ListObserverDemoViewController: UITableViewController, ListSectionObserver {
-    
-    // MARK: NSObject
-    
-    deinit {
-        
-        ColorsDemo.palettes.removeObserver(self)
-    }
-    
-    
-    // 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
-        
-        ColorsDemo.palettes.addObserver(self)
-        
-        self.setTable(enabled: !ColorsDemo.palettes.isPendingRefetch)
-    }
-    
-    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 Palette):
-            destinationViewController.palette = palette
-            
-        default:
-            break
-        }
-    }
-    
-    
-    // MARK: UITableViewDataSource
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        
-        return ColorsDemo.palettes.numberOfSections()
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        return ColorsDemo.palettes.numberOfObjects(in: section)
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
-        let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell
-        
-        let palette = ColorsDemo.palettes[indexPath]
-        cell.colorView?.backgroundColor = palette.color
-        cell.label?.text = palette.colorText
-        
-        return cell
-    }
-    
-    
-    // MARK: UITableViewDelegate
-    
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
-        tableView.deselectRow(at: indexPath, animated: true)
-        
-        self.performSegue(
-            withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath]
-        )
-    }
-    
-    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
-        
-        switch editingStyle {
-            
-        case .delete:
-            let palette = ColorsDemo.palettes[indexPath]
-            ColorsDemo.stack.perform(
-                asynchronous: { (transaction) in
-                    
-                    transaction.delete(palette)
-                },
-                completion: { _ in }
-            )
-            
-        default:
-            break
-        }
-    }
-    
-    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        
-        return ColorsDemo.palettes.sectionInfo(at: 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 = ColorsDemo.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 = ColorsDemo.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?
-    
-    @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 }
-        )
-    }
-    
-    private func setTable(enabled: Bool) {
-        
-        UIView.animate(
-            withDuration: 0.2,
-            delay: 0,
-            options: .beginFromCurrentState,
-            animations: { () -> Void in
-                
-                if let tableView = self.tableView {
-                    
-                    tableView.alpha = enabled ? 1.0 : 0.5
-                    tableView.isUserInteractionEnabled = enabled
-                }
-            },
-            completion: nil
-        )
-    }
-}
-

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

@@ -1,30 +0,0 @@
-//
-//  ObserversViewController.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2018 John Rommel Estropia. All rights reserved.
-//
-
-import UIKit
-
-
-// MARK: - ObserversViewController
-
-class ObserversViewController: UIViewController {
-    
-    // MARK: UIViewController
-    
-    override func viewDidAppear(_ animated: Bool) {
-        
-        super.viewDidAppear(animated)
-        
-        let alert = UIAlertController(
-            title: "Observers Demo",
-            message: "This demo shows how to observe changes to a list of objects. The top and bottom view controllers both observe a single shared \"ListMonitor\" instance.\n\nTap on a row to see how to observe changes made to a single object using a \"ObjectMonitor\".",
-            preferredStyle: .alert
-        )
-        alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
-        self.present(alert, animated: true, completion: nil)
-    }
-}

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

@@ -1,83 +0,0 @@
-//
-//  Palette.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2018 John Rommel Estropia. All rights reserved.
-//
-
-import Foundation
-import UIKit
-import CoreData
-import CoreStore
-
-
-// MARK: - Palette
-
-final class Palette: CoreStoreObject {
-    
-    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? {
-        
-        if let colorName = partialObject.primitiveValue(for: { $0.colorName }) {
-            
-            return colorName
-        }
-        
-        let colorName: String
-        switch partialObject.value(for: { $0.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"
-        }
-        
-        partialObject.setPrimitiveValue(colorName, for: { $0.colorName })
-        return colorName
-    }
-}
-
-extension Palette {
-    
-    var color: UIColor {
-        
-        return UIColor(
-            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.value)˚, S: \(round(self.saturation.value * 100.0))%, B: \(round(self.brightness.value * 100.0))%"
-    }
-    
-    func setInitialValues(in transaction: BaseDataTransaction) {
-        
-        self.hue .= Palette.randomHue()
-        self.saturation .= Float(1.0)
-        self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
-    }
-}

CoreStoreTests/BaseTestCase.swift

@@ -40,7 +40,7 @@ class BaseTestCase: XCTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -50,7 +50,7 @@ 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
                     )
@@ -62,16 +62,19 @@ class BaseTestCase: XCTestCase {
             
             XCTFail(error.coreStoreDumpString)
         }
+        self.addTeardownBlock {
+            stack.unsafeRemoveAllPersistentStoresAndWait()
+        }
     }
     
     @nonobjc
     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 try closure()
     }
@@ -79,7 +82,34 @@ class BaseTestCase: XCTestCase {
     @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
@@ -111,12 +141,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

@@ -34,7 +34,7 @@ import CoreStore
 class BaseTestDataTestCase: BaseTestCase {
     
     @nonobjc
-    let dateFormatter: DateFormatter = cs_lazy {
+    let dateFormatter: DateFormatter = Internals.with {
         
         let formatter = DateFormatter()
         formatter.locale = Locale(identifier: "en_US_POSIX")

CoreStoreTests/BridgingTests.m

@@ -30,6 +30,10 @@
 
 @import CoreData;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+
 // MARK: - BridgingTests
 
 @implementation BridgingTests
@@ -168,14 +172,8 @@
                               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,40 +184,33 @@
     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);
-    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" }};
-    }
+    NSDictionary *storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" },
+                                    NSBinaryStoreInsecureDecodingCompatibilityOption: @YES };
     XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions);
     XCTAssertNil(sqliteError);
 }
 
 - (void)test_ThatTransactions_BridgeCorrectly {
-    
-    [CSCoreStore
-     setDefaultStack:[[CSDataStack alloc]
-                      initWithXcodeModelName:@"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;
@@ -230,23 +221,24 @@
     {
         XCTestExpectation *expectation = [self expectationWithDescription:@"sync"];
         NSError *error;
-        BOOL result = [CSCoreStore
+        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];
+
+            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]]);
@@ -265,3 +257,5 @@
 }
 
 @end
+
+#pragma clang diagnostic pop

CoreStoreTests/ConvenienceTests.swift

@@ -29,7 +29,6 @@ import CoreStore
 
 // MARK: - ConvenienceTests
 
-@available(macOS 10.12, *)
 class ConvenienceTests: BaseTestCase {
     
     @objc
@@ -64,7 +63,7 @@ class ConvenienceTests: BaseTestCase {
         
         self.prepareStack { (stack) in
             
-            _ = withExtendedLifetime(stack.beginUnsafe()) { (transaction: UnsafeDataTransaction) in
+            withExtendedLifetime(stack.beginUnsafe()) { (transaction: UnsafeDataTransaction) in
                 
                 let controller = transaction.createFetchedResultsController(
                     From<TestEntity1>(),

CoreStoreTests/DynamicModelTests.swift

@@ -30,79 +30,156 @@ 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")
+
+    @Field.Stored("species")
+    var species: String = "Swift"
+
+    @Field.Coded("color", coder: FieldCoders.NSCoding.self)
+    var color: Color? = .blue
+
+    @Field.Relationship("master")
+    var master: Person?
 }
 
 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 })
+    static let commonNicknames = ["Spot", "Benjie", "Max", "Milo"]
+
+    @Field.Stored(
+        "nickname",
+        dynamicInitialValue: {
+            commonNicknames.randomElement()!
+        }
+    )
+    var nickname: String
+
+    @Field.Stored("age")
+    var age: Int = 1
+
+    @Field.Relationship("friends")
+    var friends: [Dog]
+
+    @Field.Relationship("friendedBy", inverse: \.$friends)
+    var friendedBy: Set<Dog>
+}
+
+struct CustomType {
+    var string = "customString"
+}
+
+enum Job: String, CaseIterable {
+
+    case unemployed
+    case engineer
+    case doctor
+    case lawyer
+
+    init?(data: Data) {
+
+        guard
+            let rawValue = String(data: data, encoding: .utf8),
+            let value = Self.init(rawValue: rawValue)
+            else {
+
+            return nil
+        }
+        self = value
+    }
+
+    func toData() -> Data {
+
+        return Data(self.rawValue.utf8)
+    }
 }
 
 class Person: CoreStoreObject {
-    
-    let title = Value.Required<String>(
+
+    @Field.Stored(
         "title",
-        initial: "Mr.",
-        customSetter: Person.setTitle
+        customSetter: { (object, field, newValue) in
+            field.primitiveValue = newValue
+            object.$displayName.primitiveValue = nil
+        }
     )
-    
-    let name = Value.Required<String>(
+    var title: String = "Mr."
+
+    @Field.Stored(
         "name",
-        initial: "",
-        customSetter: Person.setName
+        customSetter: { (object, field, newValue) in
+            field.primitiveValue = newValue
+            object.$displayName.primitiveValue = nil
+        }
     )
-    
-    let displayName = Value.Optional<String>(
+    var name: String = ""
+
+    @Field.Virtual(
         "displayName",
-        isTransient: true,
-        customGetter: Person.getDisplayName(_:),
+        customGetter: Person.getDisplayName(_:_:),
         affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
     )
-    
-    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
-    
-    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
+    var displayName: String?
+
+    @Field.Virtual(
+        "customType",
+        customGetter: { (object, field) in
+
+            if let value = field.primitiveValue {
+
+                return value
+            }
+            let value = CustomType()
+            field.primitiveValue = value
+            return value
         }
-        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
+    )
+    var customField: CustomType
+
+    @Field.Coded(
+        "job",
+        coder: (
+            encode: { $0.toData() },
+            decode: { $0.flatMap(Job.init(data:)) ?? .unemployed }
+        ),
+        dynamicInitialValue: {
+            Job.allCases.randomElement()!
+        }
+    )
+    var job: Job
+
+    @Field.Relationship("spouse")
+    var spouse: Person?
+
+    @Field.Relationship("pets", inverse: \.$master)
+    var pets: Set<Animal>
+
+    @Field.Relationship("_spouseInverse", inverse: \.$spouse)
+    private var spouseInverse: Person?
+    
+    private static func getDisplayName(_ object: ObjectProxy<Person>, _ field: ObjectProxy<Person>.FieldProxy<String?>) -> String? {
+
+        if let value = field.primitiveValue {
+
+            return value
+        }
+        let title = object.$title.value
+        let name = object.$name.value
+        let value = "\(title) \(name)"
+        field.primitiveValue = value
+        return value
     }
     
-    static func keyPathsAffectingDisplayName() -> Set<String> {
+    private static func keyPathsAffectingDisplayName() -> Set<String> {
         
         return [
-            String(keyPath: \Person.title),
-            String(keyPath: \Person.name)
+            String(keyPath: \Person.$title),
+            String(keyPath: \Person.$name)
         ]
     }
 }
@@ -125,20 +202,20 @@ class DynamicModelTests: BaseTestDataTestCase {
                 ],
                 versionLock: [
                     "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
-                    "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
-                    "Person": [0x66d8bbfd8b21561f, 0xcecec69ecae3570f, 0xc4b73d71256214ef, 0x89b99bfe3e013e8b]
+                    "Dog": [0xad6de93adc5565d, 0x7897e51253eba5a3, 0xd12b9ce0b13600f3, 0x5a4827cd794cd15e],
+                    "Person": [0xf3e6ba6016bbedc6, 0x50dedf64f0eba490, 0xa32088a0ee83468d, 0xb72d1d0b37bd0992]
                 ]
             )
         )
         self.prepareStack(dataStack, configurations: [nil]) { (stack) in
             
-            let k1 = String(keyPath: \Animal.species)
+            let k1 = String(keyPath: \Animal.$species)
             XCTAssertEqual(k1, "species")
-            
-            let k2 = String(keyPath: \Dog.species)
+
+            let k2 = String(keyPath: \Dog.$species)
             XCTAssertEqual(k2, "species")
             
-            let k3 = String(keyPath: \Dog.nickname)
+            let k3 = String(keyPath: \Dog.$nickname)
             XCTAssertEqual(k3, "nickname")
             
             let updateDone = self.expectation(description: "update-done")
@@ -150,31 +227,80 @@ class DynamicModelTests: BaseTestDataTestCase {
                 asynchronous: { (transaction) in
                     
                     let animal = transaction.create(Into<Animal>())
-                    XCTAssertEqual(animal.species.value, "Swift")
-                    XCTAssertTrue(type(of: animal.species.value) == String.self)
+                    XCTAssertEqual(animal.species, "Swift")
+                    XCTAssertTrue(type(of: animal.species) == String.self)
+                    XCTAssertEqual(animal.color, Color.blue)
                     
-                    animal.species .= "Sparrow"
-                    XCTAssertEqual(animal.species.value, "Sparrow")
+                    animal.species = "Sparrow"
+                    XCTAssertEqual(animal.species, "Sparrow")
                     
-                    animal.color .= .yellow
-                    XCTAssertEqual(animal.color.value, Color.yellow)
+                    animal.color = .yellow
+                    XCTAssertEqual(animal.color, Color.yellow)
+
+                    for property in Animal.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Animal.$species):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Stored<String>)
+
+                        case String(keyPath: \Animal.$master):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Relationship<Person?>)
+
+                        case String(keyPath: \Animal.$color):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Coded<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)
+                    XCTAssertEqual(dog.species, "Swift")
+                    XCTAssertEqual(dog.age, 1)
+                    XCTAssertTrue(Dog.commonNicknames.contains(dog.nickname))
 
-                    let didSetObserver = dog.species.observe(options: [.new, .old]) { (object, change) in
+                    for property in Dog.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Dog.$species):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Stored<String>)
+
+                        case String(keyPath: \Dog.$master):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Relationship<Person?>)
+
+                        case String(keyPath: \Dog.$color):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Coded<Color?>)
+
+                        case String(keyPath: \Dog.$nickname):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Stored<String>)
+
+                        case String(keyPath: \Dog.$age):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Stored<Int>)
+
+                        case String(keyPath: \Dog.$friends):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Relationship<[Dog]>)
+
+                        case String(keyPath: \Dog.$friendedBy):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Relationship<Set<Dog>>)
+
+                        default:
+                            XCTFail("Unknown KeyPath: \"\(property.keyPath)\"")
+                        }
+                    }
+
+                    let didSetObserver = dog.observe(\.$species, 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")
+                        XCTAssertEqual(object.species, "Dog")
                         didSetObserverDone.fulfill()
                     }
-                    let willSetObserver = dog.species.observe(options: [.new, .old, .prior]) { (object, change) in
+                    let willSetObserver = dog.observe(\.$species, options: [.new, .old, .prior]) { (object, change) in
 
                         XCTAssertEqual(object, dog)
                         XCTAssertEqual(change.kind, .setting)
@@ -183,35 +309,40 @@ class DynamicModelTests: BaseTestDataTestCase {
                         if change.isPrior {
 
                             XCTAssertNil(change.newValue)
-                            XCTAssertEqual(object.species.value, "Swift")
+                            XCTAssertEqual(object.species, "Swift")
                             willSetPriorObserverDone.fulfill()
                         }
                         else {
 
                             XCTAssertEqual(change.newValue, "Dog")
-                            XCTAssertEqual(object.species.value, "Dog")
+                            XCTAssertEqual(object.species, "Dog")
                             willSetNotPriorObserverDone.fulfill()
                         }
                     }
                     
-                    dog.species .= "Dog"
-                    XCTAssertEqual(dog.species.value, "Dog")
+                    dog.species = "Dog"
+                    XCTAssertEqual(dog.species, "Dog")
 
                     didSetObserver.invalidate()
                     willSetObserver.invalidate()
                     
-                    dog.nickname .= "Spot"
-                    XCTAssertEqual(dog.nickname.value, "Spot")
+                    dog.nickname = "Spot"
+                    XCTAssertEqual(dog.nickname, "Spot")
                     
                     let person = transaction.create(Into<Person>())
-                    XCTAssertTrue(person.pets.value.isEmpty)
+                    XCTAssertTrue(person.pets.isEmpty)
+                    XCTAssertEqual(person.customField.string, "customString")
+                    let initialJob = person.job
+                    XCTAssertTrue(Job.allCases.contains(initialJob))
                     
                     XCTAssertEqual(
-                        cs_dynamicType(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
+                        person.rawObject!
+                            .runtimeType()
+                            .keyPathsForValuesAffectingValue(forKey: "displayName"),
                         ["title", "name"]
                     )
                     
-                    person.name .= "Joe"
+                    person.name = "Joe"
                     
                     XCTAssertEqual(person.rawObject!.value(forKey: "name") as! String?, "Joe")
                     XCTAssertEqual(person.rawObject!.value(forKey: "displayName") as! String?, "Mr. Joe")
@@ -219,22 +350,66 @@ class DynamicModelTests: BaseTestDataTestCase {
                     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
+                    person.name = "John"
+                    XCTAssertEqual(person.name, "John")
+                    XCTAssertEqual(person.displayName, "Mr. John") // Custom getter
                     
-                    person.title .= "Sir"
-                    XCTAssertEqual(person.displayName.value, "Sir John")
+                    let personSnapshot1 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name, personSnapshot1.$name)
+                    XCTAssertEqual(person.title, personSnapshot1.$title)
+                    XCTAssertEqual(person.displayName, personSnapshot1.$displayName)
+                    XCTAssertEqual(person.job, personSnapshot1.$job)
                     
-                    person.pets.value.insert(dog)
+                    person.title = "Sir"
+                    XCTAssertEqual(person.displayName, "Sir John")
+                    
+                    XCTAssertEqual(personSnapshot1.$name, "John")
+                    XCTAssertEqual(personSnapshot1.$title, "Mr.")
+                    XCTAssertEqual(personSnapshot1.$displayName, "Mr. John")
+
+                    person.customField.string = "newCustomString"
+                    XCTAssertEqual(person.customField.string, "newCustomString")
+
+                    person.job = .engineer
+                    XCTAssertEqual(person.job, .engineer)
+                    
+                    let personSnapshot2 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name, personSnapshot2.$name)
+                    XCTAssertEqual(person.title, personSnapshot2.$title)
+                    XCTAssertEqual(person.displayName, personSnapshot2.$displayName)
+                    XCTAssertEqual(person.job, personSnapshot2.$job)
+
+                    var personSnapshot3 = personSnapshot2
+                    personSnapshot3.$name = "James"
+                    XCTAssertEqual(personSnapshot1.$name, "John")
+                    XCTAssertEqual(personSnapshot1.$displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot1.$job, initialJob)
+                    XCTAssertEqual(personSnapshot2.$name, "John")
+                    XCTAssertEqual(personSnapshot2.$displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot2.$job, .engineer)
+                    XCTAssertEqual(personSnapshot3.$name, "James")
+                    XCTAssertEqual(personSnapshot3.$displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot3.$job, .engineer)
+                    
+
+                    
+                    person.pets.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)
+                    XCTAssertEqual(person.pets.first, dog)
+                    XCTAssertEqual(person.pets.first?.master, person)
+                    XCTAssertEqual(dog.master, person)
+                    XCTAssertEqual(dog.master?.pets.first, dog)
                 },
                 success: { _ in
-                    
+
+                    let person = try! stack.fetchOne(From<Person>())
+                    XCTAssertNotNil(person)
+
+                    let personPublisher = person!.asPublisher(in: stack)
+                    XCTAssertEqual(personPublisher.$name, "John")
+                    XCTAssertEqual(personPublisher.$displayName, "Sir John")
+                    XCTAssertEqual(personPublisher.$job, .engineer)
+
                     updateDone.fulfill()
                 },
                 failure: { _ in
@@ -245,59 +420,67 @@ class DynamicModelTests: BaseTestDataTestCase {
             stack.perform(
                 asynchronous: { (transaction) in
                     
-                    let p1 = Where<Animal>({ $0.species == "Sparrow" })
+                    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")
+                    XCTAssertEqual(bird!.species, "Sparrow")
+                    XCTAssertEqual(bird!.color, Color.yellow)
                     
-                    let p2 = Where<Dog>({ $0.nickname == "Spot" })
+                    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"))
+                    let dog = try transaction.fetchOne(From<Dog>().where(\.$nickname == "Spot"))
                     XCTAssertNotNil(dog)
-                    XCTAssertEqual(dog!.nickname.value, "Spot")
-                    XCTAssertEqual(dog!.species.value, "Dog")
+                    XCTAssertEqual(dog!.nickname, "Spot")
+                    XCTAssertEqual(dog!.species, "Dog")
                     
                     let person = try transaction.fetchOne(From<Person>())
                     XCTAssertNotNil(person)
-                    XCTAssertEqual(person!.pets.value.first, dog)
+                    XCTAssertEqual(person!.name, "John")
+                    XCTAssertEqual(person!.title, "Sir")
+                    XCTAssertEqual(person!.displayName, "Sir John")
+                    XCTAssertEqual(person!.customField.string, "customString")
+                    XCTAssertEqual(person!.job, .engineer)
+                    XCTAssertEqual(person!.pets.first, dog)
                     
-                    let p3 = Where<Dog>({ $0.age == 10 })
+                    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)))
+                    let totalAge = try transaction.queryValue(
+                        From<Dog>().select(Int.self, .sum(\.$age))
+                    )
                     XCTAssertEqual(totalAge, 1)
                     
                     _ = try transaction.fetchAll(
                         From<Dog>()
-                            .where(\Animal.species == "Dog" && \.age == 10)
+                            .where(\Animal.$species == "Dog" && \Dog.$age == 10)
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>()
-                            .where(\.age == 10 && \Animal.species == "Dog")
-                            .orderBy(.ascending({ $0.species }))
+                            .where(\Dog.$age == 10 && \Animal.$species == "Dog")
+                            .orderBy(.ascending({ $0.$species }))
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>(),
-                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                        Where<Dog>({ $0.$age > 10 && $0.$age <= 15 })
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>(),
-                        Where<Dog>({ $0.species == "Dog" && $0.age == 10 })
+                        Where<Dog>({ $0.$species == "Dog" && $0.$age == 10 })
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>(),
-                        Where<Dog>({ $0.age == 10 && $0.species == "Dog" })
+                        Where<Dog>({ $0.$age == 10 && $0.$species == "Dog" })
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>(),
-                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                        Where<Dog>({ $0.$age > 10 && $0.$age <= 15 })
                     )
                     _ = try transaction.fetchAll(
                         From<Dog>(),
-                        (\Dog.age > 10 && \Dog.age <= 15)
+                        (\Dog.$age > 10 && \Dog.$age <= 15)
                     )
                 },
                 success: { _ in
@@ -309,15 +492,20 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTFail()
                 }
             )
-            self.waitAndCheckExpectations()
+        }
+        
+        self.waitForExpectations(timeout: 10, handler: { _ in })
+        
+        self.addTeardownBlock {
+            dataStack.unsafeRemoveAllPersistentStoresAndWait()
         }
     }
     
     @objc
     dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
         
-        XCTAssertEqual(String(keyPath: \Animal.species), "species")
-        XCTAssertEqual(String(keyPath: \Dog.species), "species")
+        XCTAssertEqual(String(keyPath: \Animal.$species), "species")
+        XCTAssertEqual(String(keyPath: \Dog.$species), "species")
     }
     
     @nonobjc
@@ -331,7 +519,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                     SQLiteStore(
                         fileURL: SQLiteStore.defaultRootDirectory
                             .appendingPathComponent(UUID().uuidString)
-                            .appendingPathComponent("\(type(of: self))_\((configuration ?? "-null-")).sqlite"),
+                            .appendingPathComponent("\(Self.self)_\((configuration ?? "-null-")).sqlite"),
                         configuration: configuration,
                         localStorageOptions: .recreateStoreOnModelMismatch
                     )

CoreStoreTests/ErrorTests.swift

@@ -31,6 +31,7 @@ import CoreStore
 
 // MARK: - ErrorTests
 
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 final class ErrorTests: XCTestCase {
 
     @objc
@@ -88,7 +89,7 @@ final class ErrorTests: XCTestCase {
         let schemaHistory = SchemaHistory(
             XcodeDataModelSchema.from(
                 modelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
             )
         )
         let version = "1.0.0"

CoreStoreTests/FetchTests.swift

@@ -132,8 +132,8 @@ final class FetchTests: BaseTestDataTestCase {
                     }
                 )
             }
+            self.waitAndCheckExpectations()
         }
-        self.waitAndCheckExpectations()
     }
     
     @objc
@@ -267,8 +267,8 @@ final class FetchTests: BaseTestDataTestCase {
                     }
                 )
             }
+            self.waitAndCheckExpectations()
         }
-        self.waitAndCheckExpectations()
     }
     
     @objc
@@ -376,17 +376,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                         OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchOne(from, fetchClauses)
                     }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectID(from, fetchClauses)
                     }
-                    XCTAssertNil(objectID as Any?)
                 }
                 do {
                     
@@ -394,17 +391,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                         OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchOne(from, fetchClauses)
                     }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectID(from, fetchClauses)
                     }
-                    XCTAssertNil(objectID as Any?)
                 }
             }
         }
@@ -559,17 +553,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                         OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchOne(from, fetchClauses)
                     }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectID(from, fetchClauses)
                     }
-                    XCTAssertNil(objectID as Any?)
                 }
                 do {
                     
@@ -577,17 +568,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                         OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchOne(from, fetchClauses)
                     }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectID(from, fetchClauses)
                     }
-                    XCTAssertNil(objectID as Any?)
                 }
             }
         }
@@ -881,17 +869,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                         OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchAll(from, fetchClauses)
                     }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectIDs(from, fetchClauses)
                     }
-                    XCTAssertNil(objectIDs)
                 }
                 do {
                     
@@ -899,17 +884,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: 0),
                         OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchAll(from, fetchClauses)
                     }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectIDs(from, fetchClauses)
                     }
-                    XCTAssertNil(objectIDs)
                 }
                 do {
                     
@@ -917,17 +899,14 @@ final class FetchTests: BaseTestDataTestCase {
                         Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: nil),
                         OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchAll(from, fetchClauses)
                     }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectIDs(from, fetchClauses)
                     }
-                    XCTAssertNil(objectIDs)
                 }
             }
         }
@@ -1119,34 +1098,28 @@ final class FetchTests: BaseTestDataTestCase {
                     let fetchClauses: [FetchClause] = [
                         OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchAll(from, fetchClauses)
                     }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectIDs(from, fetchClauses)
                     }
-                    XCTAssertNil(objectIDs)
                 }
                 do {
                     
                     let fetchClauses: [FetchClause] = [
                         OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                     ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchAll(from, fetchClauses)
                     }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchObjectIDs(from, fetchClauses)
                     }
-                    XCTAssertNil(objectIDs)
                 }
             }
         }
@@ -1411,8 +1384,8 @@ final class FetchTests: BaseTestDataTestCase {
                 
                 let from = From<TestEntity1>("Config1")
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1420,11 +1393,10 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1432,11 +1404,10 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1444,7 +1415,6 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
             }
         }
@@ -1561,8 +1531,8 @@ final class FetchTests: BaseTestDataTestCase {
                 
                 let from = From<TestEntity1>("Config2")
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1570,11 +1540,10 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1582,11 +1551,10 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
                 do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                         
                         try stack.fetchCount(
                             from,
@@ -1594,7 +1562,6 @@ final class FetchTests: BaseTestDataTestCase {
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         )
                     }
-                    XCTAssertNil(count)
                 }
             }
         }
@@ -1821,17 +1788,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchOne(from, fetchClauses)
                         }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectID(from, fetchClauses)
                         }
-                        XCTAssertNil(objectID as Any?)
                     }
                     do {
                         
@@ -1839,17 +1803,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchOne(from, fetchClauses)
                         }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectID(from, fetchClauses)
                         }
-                        XCTAssertNil(objectID as Any?)
                     }
                     try transaction.cancel()
                 }
@@ -2015,17 +1976,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchOne(from, fetchClauses)
                         }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectID(from, fetchClauses)
                         }
-                        XCTAssertNil(objectID as Any?)
                     }
                     do {
                         
@@ -2033,17 +1991,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchOne(from, fetchClauses)
                         }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectID(from, fetchClauses)
                         }
-                        XCTAssertNil(objectID as Any?)
                     }
                     try transaction.cancel()
                 }
@@ -2353,17 +2308,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchAll(from, fetchClauses)
                         }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectIDs(from, fetchClauses)
                         }
-                        XCTAssertNil(objectIDs)
                     }
                     do {
                         
@@ -2371,17 +2323,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: 0),
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchAll(from, fetchClauses)
                         }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectIDs(from, fetchClauses)
                         }
-                        XCTAssertNil(objectIDs)
                     }
                     do {
                         
@@ -2389,17 +2338,14 @@ final class FetchTests: BaseTestDataTestCase {
                             Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: nil),
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchAll(from, fetchClauses)
                         }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectIDs(from, fetchClauses)
                         }
-                        XCTAssertNil(objectIDs)
                     }
                     try transaction.cancel()
                 }
@@ -2614,34 +2560,28 @@ final class FetchTests: BaseTestDataTestCase {
                         let fetchClauses: [FetchClause] = [
                             OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchAll(from, fetchClauses)
                         }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectIDs(from, fetchClauses)
                         }
-                        XCTAssertNil(objectIDs)
                     }
                     do {
                         
                         let fetchClauses: [FetchClause] = [
                             OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                         ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchAll(from, fetchClauses)
                         }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchObjectIDs(from, fetchClauses)
                         }
-                        XCTAssertNil(objectIDs)
                     }
                     try transaction.cancel()
                 }
@@ -2940,8 +2880,8 @@ final class FetchTests: BaseTestDataTestCase {
                     
                     let from = From<TestEntity1>("Config1")
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -2949,11 +2889,10 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -2961,11 +2900,10 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -2973,7 +2911,6 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     try transaction.cancel()
                 }
@@ -3101,8 +3038,8 @@ final class FetchTests: BaseTestDataTestCase {
                     
                     let from = From<TestEntity1>("Config2")
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -3110,11 +3047,10 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -3122,11 +3058,10 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                             
                             try transaction.fetchCount(
                                 from,
@@ -3134,7 +3069,6 @@ final class FetchTests: BaseTestDataTestCase {
                                 OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                             )
                         }
-                        XCTAssertNil(count)
                     }
                     try transaction.cancel()
                 }

CoreStoreTests/FromTests.swift

@@ -74,32 +74,31 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
+                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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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)
             }
         }
@@ -114,102 +113,98 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
+                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 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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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)
             }
         }
@@ -224,99 +219,96 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
+                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 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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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 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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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)
             }
         }
@@ -331,96 +323,94 @@ final class FromTests: BaseTestCase {
                 
                 let from = From<TestEntity1>()
                 
-                let request = CoreStoreFetchRequest()
+                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 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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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 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: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                     
                     try from.applyToFetchRequest(request, context: dataStack.mainContext)
                 }
-                XCTAssertNil(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 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

@@ -68,7 +68,7 @@ final class GroupByTests: BaseTestCase {
             
             let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
             
-            let request = CoreStoreFetchRequest()
+            let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
             try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
             groupBy.applyToFetchRequest(request)
             

CoreStoreTests/Info.plist

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

CoreStoreTests/ListObserverTests.swift

@@ -31,7 +31,6 @@ import CoreStore
 
 // MARK: - ListObserverTests
 
-@available(macOS 10.12, *)
 class ListObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -53,7 +52,7 @@ class ListObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -67,7 +66,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            let didInsertSectionExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -87,7 +86,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 1
                 }
             )
-            let didInsertObjectExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -119,7 +118,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 2
                 }
             )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -184,7 +183,7 @@ class ListObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -199,7 +198,7 @@ class ListObserverTests: BaseTestDataTestCase {
                 }
             )
             
-            let didUpdateObjectExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -250,7 +249,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 1 || events == 2
                 }
             )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -329,7 +328,7 @@ class ListObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -343,7 +342,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            let didMoveObjectExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -376,7 +375,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 1
                 }
             )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -437,7 +436,7 @@ class ListObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -451,7 +450,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            let didUpdateObjectExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -480,7 +479,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 1 || events == 2
                 }
             )
-            let didDeleteSectionExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -508,7 +507,7 @@ class ListObserverTests: BaseTestDataTestCase {
                     return events == 3
                 }
             )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -551,7 +550,6 @@ class ListObserverTests: BaseTestDataTestCase {
 
 // MARK: TestListObserver
 
-@available(macOS 10.12, *)
 class TestListObserver: ListSectionObserver {
     
     // MARK: ListObserver

CoreStoreTests/ListPublisherTests.swift

@@ -0,0 +1,304 @@
+//
+//  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 = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertFalse(listPublisher.snapshot.hasSections())
+            XCTAssertFalse(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.itemIDs.isEmpty)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 1)
+
+                didChangeExpectation.fulfill()
+            }
+            
+            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, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveUpdateNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+                didChangeExpectation.fulfill()
+            }
+
+            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()
+
+            withExtendedLifetime(listPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveMoveNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 1)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 4)
+
+                didChangeExpectation.fulfill()
+            }
+
+            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()
+
+            withExtendedLifetime(listPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveDeleteNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 1)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 3)
+
+                didChangeExpectation.fulfill()
+            }
+
+            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()
+        }
+    }
+}
+
+#endif
+

CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C67" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<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" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
@@ -9,6 +9,8 @@
         <attribute name="testNil" optional="YES" attributeType="String" 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" usesScalarValueType="NO" syncable="YES"/>
@@ -19,6 +21,8 @@
         <attribute name="testNil" optional="YES" attributeType="String" 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

@@ -31,7 +31,6 @@ import CoreStore
 
 // MARK: - ObjectObserverTests
 
-@available(macOS 10.12, *)
 class ObjectObserverTests: BaseTestDataTestCase {
     
     @objc
@@ -57,7 +56,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let willUpdateExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "objectMonitor:willUpdateObject:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -74,7 +73,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
                     return events == 0
                 }
             )
-            let didUpdateExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "objectMonitor:didUpdateObject:changedPersistentKeys:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -154,7 +153,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
             
             var events = 0
             
-            let didDeleteExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "objectMonitor:didDeleteObject:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -203,7 +202,6 @@ class ObjectObserverTests: BaseTestDataTestCase {
 
 // MARK: TestObjectObserver
 
-@available(macOS 10.12, *)
 class TestObjectObserver: ObjectObserver {
     
     typealias ObjectEntityType = TestEntity1

CoreStoreTests/ObjectPublisherTests.swift

@@ -0,0 +1,154 @@
+//
+//  ObjectPublisherTests.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: - ObjectPublisherTests
+
+class ObjectPublisherTests: BaseTestDataTestCase {
+
+    @objc
+    dynamic func test_ThatObjectPublishers_CanReceiveUpdateNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            guard let object = try stack.fetchOne(
+                From<TestEntity1>(),
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+
+                    XCTFail()
+                    return
+            }
+            let observer = NSObject()
+            let objectPublisher = stack.publishObject(object)
+            XCTAssertEqual(objectPublisher.object, object)
+            XCTAssertNotNil(objectPublisher.snapshot)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            objectPublisher.addObserver(observer) { objectPublisher in
+
+                XCTAssertEqual(objectPublisher.object?.testNumber, NSNumber(value: 10))
+                XCTAssertEqual(objectPublisher.object?.testString, "nil:TestEntity1:10")
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            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()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(objectPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatObjectPublishers_CanReceiveDeleteNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            guard let object = try stack.fetchOne(
+                From<TestEntity1>(),
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+
+                    XCTFail()
+                    return
+            }
+            let observer = NSObject()
+            let objectPublisher = stack.publishObject(object)
+            XCTAssertEqual(objectPublisher.object, object)
+            XCTAssertNotNil(objectPublisher.snapshot)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            objectPublisher.addObserver(observer) { objectPublisher in
+
+                XCTAssertNil(objectPublisher.object)
+                XCTAssertNil(objectPublisher.snapshot)
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            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)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(objectPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+}
+

CoreStoreTests/OrderByTests.swift

@@ -179,7 +179,7 @@ final class OrderByTests: XCTestCase {
     dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
         
         let orderBy = OrderBy<NSManagedObject>(.ascending("key"))
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
         orderBy.applyToFetchRequest(request)
         XCTAssertNotNil(request.sortDescriptors)
         XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)

CoreStoreTests/SectionByTests.swift

@@ -31,7 +31,6 @@ import CoreStore
 
 //MARK: - SectionByTests
 
-@available(macOS 10.12, *)
 final class SectionByTests: XCTestCase {
     
     @objc
@@ -41,11 +40,14 @@ final class SectionByTests: XCTestCase {
             
             let sectionBy = SectionBy<NSManagedObject>("key")
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
-            XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key")
+            XCTAssertNil(sectionBy.sectionIndexTransformer("key"))
         }
         do {
             
-            let sectionBy = SectionBy<NSManagedObject>("key") { $0.flatMap { "\($0):suffix" } }
+            let sectionBy = SectionBy<NSManagedObject>(
+                "key",
+                sectionIndexTransformer: { $0.flatMap { "\($0):suffix" } }
+            )
             XCTAssertEqual(sectionBy.sectionKeyPath, "key")
             XCTAssertEqual(sectionBy.sectionIndexTransformer("key"), "key:suffix")
             XCTAssertNil(sectionBy.sectionIndexTransformer(nil))

CoreStoreTests/SetupTests.swift

@@ -39,7 +39,7 @@ class SetupTests: BaseTestDataTestCase {
             let schemaHistory = SchemaHistory(
                 XcodeDataModelSchema.from(
                     modelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    bundle: Bundle(for: Self.self)
                 )
             )
             let stack = DataStack(schemaHistory: schemaHistory)
@@ -56,9 +56,6 @@ class SetupTests: BaseTestDataTestCase {
             XCTAssertTrue(stack.schemaHistory.migrationChain.isEmpty)
             XCTAssertTrue(stack.schemaHistory.migrationChain.rootVersions.isEmpty)
             XCTAssertTrue(stack.schemaHistory.migrationChain.leafVersions.isEmpty)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
         }
         do {
             
@@ -68,15 +65,12 @@ class SetupTests: BaseTestDataTestCase {
                 
                 DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self)),
+                    bundle: Bundle(for: Self.self),
                     migrationChain: migrationChain
                 )
             }
             XCTAssertEqual(stack.modelVersion, "Model")
             XCTAssertEqual(stack.schemaHistory.migrationChain, migrationChain)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
         }
     }
     
@@ -85,7 +79,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -140,7 +134,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -208,7 +202,7 @@ class SetupTests: BaseTestDataTestCase {
                 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    bundle: Bundle(for: Self.self)
                 )
                 try! stack.addStorageAndWait(sqliteStore)
                 self.prepareTestDataForStack(stack)
@@ -227,7 +221,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,
@@ -260,7 +254,7 @@ class SetupTests: BaseTestDataTestCase {
         
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
         )
         do {
             
@@ -328,9 +322,16 @@ class SetupTests: BaseTestDataTestCase {
                 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    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))
@@ -347,7 +348,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,

CoreStoreTests/StorageInterfaceTests.swift

@@ -83,21 +83,11 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        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.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -112,7 +102,7 @@ final class StorageInterfaceTests: XCTestCase {
             .appendingPathExtension("db")
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
         )
         
         let store = SQLiteStore(
@@ -123,21 +113,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        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.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, fileURL)
         XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
@@ -150,7 +130,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
         )
         let store = SQLiteStore(
             fileName: fileName,
@@ -160,21 +140,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        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.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
@@ -209,21 +179,11 @@ final class StorageInterfaceTests: XCTestCase {
         let store = SQLiteStore.legacy()
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertNil(store.configuration)
-        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.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL)
         XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -236,7 +196,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
         )
         let store = SQLiteStore.legacy(
             fileName: fileName,
@@ -246,21 +206,11 @@ final class StorageInterfaceTests: XCTestCase {
         )
         XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
         XCTAssertEqual(store.configuration, "config1")
-        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.storeOptions as NSDictionary?,
+            [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+             NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+        )
         
         XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory)
         XCTAssertEqual(store.fileURL.lastPathComponent, fileName)

CoreStoreTests/TestEntity1.swift

@@ -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

@@ -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/TransactionTests.swift

@@ -303,8 +303,8 @@ final class TransactionTests: BaseTestCase {
             do {
                 
                 let createExpectation = self.expectation(description: "create")
-                let dataPrepared: Void? = try? stack.perform(
-                    synchronous: { (transaction) in
+                try stack.perform(
+                    synchronous: { (transaction) -> Void in
                         
                         let object = transaction.create(Into<TestEntity1>())
                         object.testEntityID = NSNumber(value: 1)
@@ -313,10 +313,7 @@ final class TransactionTests: BaseTestCase {
                         object.testDate = testDate
                     }
                 )
-                if dataPrepared != nil {
-                    
-                    createExpectation.fulfill()
-                }
+                createExpectation.fulfill()
                 self.checkExpectationsImmediately()
             }
             do {
@@ -386,8 +383,6 @@ final class TransactionTests: BaseTestCase {
         }
     }
     
-    
-    @available(macOS 10.12, *)
     @objc
     dynamic func test_ThatSynchronousTransactions_CanCommitWithoutWaitingForMerges() {
         
@@ -403,7 +398,7 @@ final class TransactionTests: BaseTestCase {
             XCTAssertFalse(monitor.hasObjects())
             
             var events = 0
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -417,7 +412,7 @@ final class TransactionTests: BaseTestCase {
                     return events == 0
                 }
             )
-            let didInsertObjectExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -447,7 +442,7 @@ final class TransactionTests: BaseTestCase {
                     return events == 1
                 }
             )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                 forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                 object: observer,
                 handler: { (note) -> Bool in
@@ -625,8 +620,8 @@ final class TransactionTests: BaseTestCase {
                     }
                 )
             }
+            self.waitAndCheckExpectations()
         }
-        self.waitAndCheckExpectations()
     }
     
     @objc
@@ -758,8 +753,8 @@ final class TransactionTests: BaseTestCase {
                     }
                 )
             }
+            self.waitAndCheckExpectations()
         }
-        self.waitAndCheckExpectations()
     }
     
     @objc
@@ -899,8 +894,8 @@ final class TransactionTests: BaseTestCase {
                     }
                 )
             }
+            self.waitAndCheckExpectations()
         }
-        self.waitAndCheckExpectations()
     }
     
     @objc

CoreStoreTests/TweakTests.swift

@@ -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

@@ -31,12 +31,12 @@ import CoreStore
 
 // MARK: - XCTAssertAllEqual
 
-private func XCTAssertAllEqual<D>(_ whereClauses: Where<D>...) {
+private func XCTAssertAllEqual<O>(_ whereClauses: Where<O>...) {
     
     XCTAssertAllEqual(whereClauses)
 }
 
-private func XCTAssertAllEqual<D>(_ whereClauses: [Where<D>]) {
+private func XCTAssertAllEqual<O>(_ whereClauses: [Where<O>]) {
     
     for i in whereClauses.indices {
         
@@ -47,6 +47,17 @@ private func XCTAssertAllEqual<D>(_ whereClauses: [Where<D>]) {
     }
 }
 
+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
 
@@ -55,7 +66,276 @@ final class WhereTests: XCTestCase {
     @objc
     dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
         
-        XCTAssertEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertAllEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertAllEqual(String(keyPath: \Animal.$color), "color")
+    }
+
+    @objc
+    dynamic func test_ThatExpressions_HaveCorrectKeyPaths() {
+
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testEntityID),
+                    (\TestEntity1.testToOne ~ \.testEntityID).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testEntityID)
+                )
+                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
@@ -64,51 +344,51 @@ final class WhereTests: XCTestCase {
         do {
             
             let whereClause = Where<NSManagedObject>()
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(true))
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(true))
             XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
         }
         do {
             
             let whereClause = Where<NSManagedObject>(true)
-            XCTAssertEqual(whereClause, Where<NSManagedObject>())
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>())
             XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
         }
         do {
             
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
             let whereClause = Where<NSManagedObject>(predicate)
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
             let whereClause = Where<NSManagedObject>("%K == %@", "key", "value")
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
             let whereClause = Where<NSManagedObject>("%K == %@", argumentArray: ["key", "value"])
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
             let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
             let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
         do {
             
             let whereClause = Where<NSManagedObject>("key", isMemberOf: ["value1", "value2", "value3"])
             let predicate = NSPredicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
         }
     }
     
@@ -243,8 +523,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 {
             
@@ -259,8 +539,8 @@ 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 {
             
@@ -274,8 +554,8 @@ final class WhereTests: XCTestCase {
             let unwrappedFinalSomeWhere = andWhere && someWhere!
 
         
-            XCTAssertEqual(andWhere.predicate, finalNoneWhere.predicate)
-            XCTAssertEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
+            XCTAssertAllEqual(andWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
         }
         do {
             
@@ -290,8 +570,8 @@ 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 {
             
@@ -304,8 +584,8 @@ final class WhereTests: XCTestCase {
             let finalSomeWhere = orWhere &&? someWhere
             let unwrappedFinalSomeWhere = orWhere && someWhere!
             
-            XCTAssertEqual(orWhere.predicate, finalNoneWhere.predicate)
-            XCTAssertEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
+            XCTAssertAllEqual(orWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
         }
 
     }
@@ -314,9 +594,9 @@ final class WhereTests: XCTestCase {
     dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
         
         let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
         whereClause.applyToFetchRequest(request)
         XCTAssertNotNil(request.predicate)
-        XCTAssertEqual(request.predicate, whereClause.predicate)
+        XCTAssertAllEqual(request.predicate, whereClause.predicate)
     }
 }

Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-               BuildableName = "CoreStoreDemo.app"
-               BlueprintName = "CoreStoreDemo"
-               ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
+               BlueprintIdentifier = "B5A3911824E5429200E7E8BD"
+               BuildableName = "Demo.app"
+               BlueprintName = "Demo"
+               ReferencedContainer = "container:Demo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -29,17 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -55,14 +44,12 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
+            BlueprintIdentifier = "B5A3911824E5429200E7E8BD"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -74,10 +61,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
+            BlueprintIdentifier = "B5A3911824E5429200E7E8BD"
+            BuildableName = "Demo.app"
+            BlueprintName = "Demo"
+            ReferencedContainer = "container:Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

Demo/Info.plist

@@ -0,0 +1,70 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UIStatusBarTintParameters</key>
+	<dict>
+		<key>UINavigationBar</key>
+		<dict>
+			<key>Style</key>
+			<string>UIBarStyleDefault</string>
+			<key>Translucent</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

Demo/Rakefile

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+task :format do
+    
+    require 'xcodeproj'
+    require 'fileutils'
+
+    project_path = 'Demo.xcodeproj'
+    ignore_targets = []
+
+    # http://www.rubydoc.info/github/CocoaPods/Xcodeproj
+    project = Xcodeproj::Project.open(project_path)
+    validTargets = project.targets.select { |target| target.respond_to?(:product_type) }
+
+    validTargets.each do |target|
+        if ignore_targets.include?(target.display_name)
+            next
+        end
+        case target.product_type
+
+        when 'com.apple.product-type.application', 'com.apple.product-type.framework'
+            target.source_build_phase.files.sort! do |f1, f2|
+                result = (f1.display_name.count "+") <=> (f2.display_name.count "+")
+                if result != 0
+                    next -result
+                end
+                result = (f1.display_name.count "-") <=> (f2.display_name.count "-")
+                if result != 0
+                    next -result
+                end
+                result = (f1.display_name.count ".") <=> (f2.display_name.count ".")
+                if result != 0
+                    next result
+                end
+                (f1.display_name <=> f2.display_name)
+            end
+
+        end
+    end
+
+    project.save()
+end

Demo/Resources/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController interfaceStyle="dark" id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Bp2-lt-3DL">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2020 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Yn3-8H-uzI">
+                                <rect key="frame" x="20" y="827" width="374" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="CoreStoreIcon" translatesAutoresizingMaskIntoConstraints="NO" id="IrK-8p-pit">
+                                <rect key="frame" x="122" y="228.5" width="170" height="170"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="IrK-8p-pit" secondAttribute="height" multiplier="1:1" id="WaM-8F-33r"/>
+                                    <constraint firstAttribute="width" constant="170" id="dlo-1N-ikz"/>
+                                </constraints>
+                            </imageView>
+                            <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="8Vu-0U-3hd">
+                                <rect key="frame" x="20" y="418.5" width="374" height="57.5"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="Yn3-8H-uzI" firstAttribute="leading" secondItem="Bp2-lt-3DL" secondAttribute="leading" constant="20" symbolic="YES" id="7Dq-xP-k2v"/>
+                            <constraint firstItem="IrK-8p-pit" firstAttribute="centerY" secondItem="Bp2-lt-3DL" secondAttribute="centerY" multiplier="0.7" id="HUz-XL-l27"/>
+                            <constraint firstItem="IrK-8p-pit" firstAttribute="centerX" secondItem="Bp2-lt-3DL" secondAttribute="centerX" id="TSf-yM-hl1"/>
+                            <constraint firstAttribute="centerX" secondItem="8Vu-0U-3hd" secondAttribute="centerX" id="TX2-HT-cKs"/>
+                            <constraint firstItem="Z3i-EZ-UGs" firstAttribute="bottom" secondItem="Yn3-8H-uzI" secondAttribute="bottom" constant="14" id="hAb-SJ-Qnm"/>
+                            <constraint firstAttribute="centerX" secondItem="Yn3-8H-uzI" secondAttribute="centerX" id="pNf-eo-RXZ"/>
+                            <constraint firstItem="8Vu-0U-3hd" firstAttribute="leading" secondItem="Bp2-lt-3DL" secondAttribute="leading" constant="20" symbolic="YES" id="pef-yD-C5e"/>
+                            <constraint firstItem="8Vu-0U-3hd" firstAttribute="top" secondItem="IrK-8p-pit" secondAttribute="bottom" constant="20" id="xQP-tq-hNL"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Z3i-EZ-UGs"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="CoreStoreIcon" width="170" height="170"/>
+    </resources>
+</document>

Demo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,115 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-60@3x-1.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "Mask + Oval 1 + Oval 1 + Oval 1.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "idiom" : "car",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-60@3x.png",
+      "idiom" : "car",
+      "scale" : "3x",
+      "size" : "60x60"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Demo/Resources/Images.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Demo/Resources/Images.xcassets/CoreStoreIcon.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CoreStoreIcon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Demo/Resources/Preview Content/Preview Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Demo/⭐️Sources/AppDelegate.swift

@@ -0,0 +1,33 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import UIKit
+
+// MARK: - AppDelegate
+
+@UIApplicationMain
+@objc final class AppDelegate: UIResponder, UIApplicationDelegate {
+    
+    // MARK: UIApplicationDelegate
+
+    @objc dynamic func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+    ) -> Bool {
+        
+        return true
+    }
+
+    @objc dynamic func application(
+        _ application: UIApplication,
+        configurationForConnecting connectingSceneSession: UISceneSession,
+        options: UIScene.ConnectionOptions
+    ) -> UISceneConfiguration {
+        
+        return UISceneConfiguration(
+            name: "Default Configuration",
+            sessionRole: connectingSceneSession.role
+        )
+    }
+}

Demo/⭐️Sources/Helpers/ImageDownloader.swift

@@ -0,0 +1,69 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import Foundation
+import UIKit
+import Combine
+
+// MARK: - ImageDownloader
+
+final class ImageDownloader: ObservableObject {
+    
+    // MARK: FilePrivate
+    
+    private(set) var image: UIImage?
+    
+    let url: URL?
+    
+    init(url: URL?) {
+        
+        self.url = url
+        guard let url = url else {
+            
+            return
+        }
+        if let image = Self.cache[url] {
+            
+            self.image = image
+        }
+    }
+    
+    func fetchImage(completion: @escaping (UIImage) -> Void = { _ in }) {
+        
+        guard let url = url else {
+            
+            return
+        }
+        if let image = Self.cache[url] {
+            
+            self.objectWillChange.send()
+            self.image = image
+            completion(image)
+            return
+        }
+        self.cancellable = URLSession.shared
+            .dataTaskPublisher(for: url)
+            .receive(on: DispatchQueue.main)
+            .sink(
+                receiveCompletion: { _ in },
+                receiveValue: { output in
+                    
+                    if let image = UIImage(data: output.data) {
+                        
+                        Self.cache[url] = image
+                        self.objectWillChange.send()
+                        self.image = image
+                        completion(image)
+                    }
+                }
+            )
+    }
+    
+    
+    // MARK: Private
+    
+    private static var cache: [URL: UIImage] = [:]
+    
+    private var cancellable: AnyCancellable?
+}

Demo/⭐️Sources/Helpers/InstructionsView.swift

@@ -0,0 +1,58 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - InstructionsView
+
+struct InstructionsView: View {
+    
+    // MARK: Internal
+    
+    init(_ rows: (header: String, description: String)...) {
+        
+        self.rows = rows.map({ .init(header: $0, description: $1) })
+    }
+    
+    
+    // MARK: View
+    
+    var body: some View {
+        ZStack(alignment: .center) {
+            RoundedRectangle(cornerRadius: 10, style: .continuous)
+                .fill(Color.white)
+                .shadow(color: Color(.sRGB, white: 0.5, opacity: 0.3), radius: 2, x: 1, y: 1)
+            VStack(alignment: .leading, spacing: 3) {
+                ForEach(self.rows, id: \.header) { row in
+                    HStack(alignment: .firstTextBaseline, spacing: 5) {
+                        Text(row.header)
+                            .font(.callout)
+                            .fontWeight(.bold)
+                        Text(row.description)
+                            .font(.footnote)
+                    }
+                }
+            }
+            .foregroundColor(Color(.sRGB, white: 0, opacity: 0.8))
+            .padding(.horizontal, 10)
+            .padding(.vertical, 4)
+        }
+        .fixedSize()
+    }
+    
+    // MARK: Private
+    
+    private let rows: [InstructionsView.Row]
+    
+    
+    // MARK: - Row
+    
+    struct Row: Hashable {
+    
+        // MARK: Internal
+        let header: String
+        let description: String
+    }
+}
+

Demo/⭐️Sources/Helpers/LazyView.swift

@@ -0,0 +1,29 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - LazyView
+
+struct LazyView<Content: View>: View {
+    
+    // MARK: Internal
+    
+    init(_ load: @escaping () -> Content) {
+        
+        self.load = load
+    }
+    
+    
+    // MARK: View
+    
+    var body: Content {
+        
+        self.load()
+    }
+    
+    // MARK: Private
+    
+    private let load: () -> Content
+}

Demo/⭐️Sources/Helpers/Menu/Menu.ItemView.swift

@@ -0,0 +1,71 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - Menu
+
+extension Menu {
+    
+    // MARK: - Menu.ItemView
+    
+    struct ItemView<Destination: View>: View {
+        
+        // MARK: Internal
+        
+        init(
+            title: String,
+            subtitle: String? = nil,
+            destination: @escaping () -> Destination
+        ) {
+            self.title = title
+            self.subtitle = subtitle
+            self.destination = destination
+        }
+        
+        
+        // MARK: View
+
+        var body: some View {
+            NavigationLink(destination: LazyView(self.destination)) {
+                VStack(alignment: .leading) {
+                    Text(self.title)
+                        .font(.headline)
+                        .foregroundColor(.primary)
+                    self.subtitle.map {
+                        Text($0)
+                            .font(.subheadline)
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+        }
+        
+        
+        // MARK: FilePrivate
+        
+        fileprivate let title: String
+        fileprivate let subtitle: String?
+        fileprivate let destination: () -> Destination
+    }
+}
+
+#if DEBUG
+
+struct _Demo_Menu_ItemView_Preview: PreviewProvider {
+    
+    // MARK: PreviewProvider
+    
+    static var previews: some View {
+        Menu.ItemView(
+            title: "Item Title",
+            subtitle: "A subtitle caption for this item",
+            destination: {
+                Color.blue
+            }
+        )
+    }
+}
+
+#endif

Demo/⭐️Sources/Helpers/Menu/Menu.MainView.swift

@@ -0,0 +1,134 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import Foundation
+import SwiftUI
+
+
+// MARK: - Menu
+
+extension Menu {
+    
+    // MARK: - Menu.MainView
+
+    struct MainView: View {
+        
+        // MARK: View
+        
+        var body: some View {
+            NavigationView {
+                List {
+                    Section(header: Text("Modern (CoreStoreObject subclasses)")) {
+                        Menu.ItemView(
+                            title: "Placemarks",
+                            subtitle: "Making changes using Transactions",
+                            destination: {
+                                Modern.PlacemarksDemo.MainView()
+                            }
+                        )
+                        Menu.ItemView(
+                            title: "Time Zones",
+                            subtitle: "Fetching objects and Querying raw values",
+                            destination: {
+                                Modern.TimeZonesDemo.MainView()
+                            }
+                        )
+                        Menu.ItemView(
+                            title: "Colors (UIKit)",
+                            subtitle: "Observing list changes and single-object changes using DiffableDataSources",
+                            destination: {
+                                Modern.ColorsDemo.MainView(
+                                    listView: { listPublisher, onPaletteTapped in
+                                        Modern.ColorsDemo.UIKit.ListView(
+                                            listPublisher: listPublisher,
+                                            onPaletteTapped: onPaletteTapped
+                                        )
+                                        .edgesIgnoringSafeArea(.all)
+                                    },
+                                    detailView: { objectPublisher in
+                                        Modern.ColorsDemo.UIKit.DetailView(objectPublisher)
+                                    }
+                                )
+                            }
+                        )
+                        Menu.ItemView(
+                            title: "Colors (SwiftUI)",
+                            subtitle: "Observing list changes and single-object changes using SwiftUI bindings",
+                            destination: {
+                                Modern.ColorsDemo.MainView(
+                                    listView: { listPublisher, onPaletteTapped in
+                                        Modern.ColorsDemo.SwiftUI.ListView(
+                                            listPublisher: listPublisher,
+                                            onPaletteTapped: onPaletteTapped
+                                        )
+                                    },
+                                    detailView: { objectPublisher in
+                                        Modern.ColorsDemo.SwiftUI.DetailView(objectPublisher)
+                                    }
+                                )
+                            }
+                        )
+                        Menu.ItemView(
+                            title: "Pokedex API",
+                            subtitle: "Importing JSON data from external source",
+                            destination: {
+                                Modern.PokedexDemo.MainView(
+                                    listView: Modern.PokedexDemo.UIKit.ListView.init
+                                )
+                            }
+                        )
+                    }
+                    Section(header: Text("Classic (NSManagedObject subclasses)")) {
+                        Menu.ItemView(
+                            title: "Colors",
+                            subtitle: "Observing list changes and single-object changes using ListMonitor",
+                            destination: {
+                                Classic.ColorsDemo.MainView()
+                            }
+                        )
+                    }
+                    Section(header: Text("Advanced")) {
+                        Menu.ItemView(
+                            title: "Accounts",
+                            subtitle: "Switching between multiple persistent stores",
+                            destination: { EmptyView() }
+                        )
+                        .disabled(true)
+                        Menu.ItemView(
+                            title: "Evolution",
+                            subtitle: "Migrating and reverse-migrating stores",
+                            destination: {
+                                Advanced.EvolutionDemo.MainView()
+                            }
+                        )
+                        Menu.ItemView(
+                            title: "Logger",
+                            subtitle: "Implementing a custom logger",
+                            destination: { EmptyView() }
+                        )
+                        .disabled(true)
+                    }
+                }
+                .listStyle(GroupedListStyle())
+                .navigationBarTitle("CoreStore Demos")
+                Menu.PlaceholderView()
+            }
+            .navigationViewStyle(DoubleColumnNavigationViewStyle())
+        }
+    }
+}
+
+#if DEBUG
+
+struct _Demo_Menu_MainView_Preview: PreviewProvider {
+    
+    // MARK: PreviewProvider
+    
+    static var previews: some View {
+        
+        Menu.MainView()
+    }
+}
+
+#endif

Demo/⭐️Sources/Helpers/Menu/Menu.PlaceholderView.swift

@@ -0,0 +1,44 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import Combine
+import CoreStore
+import SwiftUI
+
+// MARK: - Menu
+
+extension Menu {
+
+    // MARK: - Menu.PlaceholderView
+
+    struct PlaceholderView: UIViewControllerRepresentable {
+
+        // MARK: UIViewControllerRepresentable
+
+        typealias UIViewControllerType = UIViewController
+
+        func makeUIViewController(context: Self.Context) -> UIViewControllerType {
+
+            return UIStoryboard(name: "LaunchScreen", bundle: nil).instantiateInitialViewController()!
+        }
+
+        func updateUIViewController(_ uiViewController: UIViewControllerType, context: Self.Context) {}
+
+        static func dismantleUIViewController(_ uiViewController: UIViewControllerType, coordinator: Void) {}
+    }
+}
+
+#if DEBUG
+
+struct _Demo_Menu_PlaceholderView_Preview: PreviewProvider {
+
+    // MARK: PreviewProvider
+
+    static var previews: some View {
+
+        return Menu.PlaceholderView()
+    }
+}
+
+#endif

Demo/⭐️Sources/Helpers/Menu/Menu.swift

@@ -0,0 +1,10 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import Foundation
+
+
+// MARK: - Menu
+
+enum Menu {}

Demo/⭐️Sources/SceneDelegate.swift

@@ -0,0 +1,36 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+import UIKit
+
+// MARK: - SceneDelegate
+
+@objc final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+    
+    // MARK: UIWindowSceneDelegate
+
+    @objc dynamic var window: UIWindow?
+
+    
+    // MARK: UISceneDelegate
+
+    @objc dynamic func scene(
+        _ scene: UIScene,
+        willConnectTo session: UISceneSession,
+        options connectionOptions: UIScene.ConnectionOptions
+    ) {
+        
+        guard case let scene as UIWindowScene = scene else {
+            
+            return
+        }
+        let window = UIWindow(windowScene: scene)
+        window.rootViewController = UIHostingController(
+            rootView: Menu.MainView()
+        )
+        self.window = window
+        window.makeKeyAndVisible()
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/Advanced.swift

@@ -0,0 +1,10 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+// MARK: - Advanced
+
+/**
+Sample application of complex use cases
+*/
+enum Advanced {}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.CreatureType.swift

@@ -0,0 +1,30 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+import Foundation
+
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    typealias CreatureType = Advanced_EvolutionDemo_CreatureType
+}
+
+
+// MARK: - Advanced.EvolutionDemo.CreatureType
+
+protocol Advanced_EvolutionDemo_CreatureType: DynamicObject, CustomStringConvertible {
+
+    var dnaCode: Int64 { get set }
+
+    static func dataSource(in dataStack: DataStack) -> Advanced.EvolutionDemo.CreaturesDataSource
+
+    static func count(in transaction: BaseDataTransaction) throws -> Int
+
+    static func create(in transaction: BaseDataTransaction) -> Self
+
+    func mutate(in transaction: BaseDataTransaction)
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.CreaturesDataSource.swift

@@ -0,0 +1,168 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+import Combine
+
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    // MARK: - Advanced.EvolutionDemo.CreaturesDataSource
+
+    /**
+     A type-erasing adapter to support different `ListPublisher` types
+     */
+    final class CreaturesDataSource: ObservableObject {
+
+        // MARK: Internal
+
+        init<T: NSManagedObject & Advanced.EvolutionDemo.CreatureType>(
+            listPublisher: ListPublisher<T>,
+            dataStack: DataStack
+        ) {
+
+            self.numberOfItems = {
+                listPublisher.snapshot.numberOfItems
+            }
+            self.itemDescriptionAtIndex = { index in
+                listPublisher.snapshot[index].object?.description
+            }
+            self.addItems = { count in
+
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        let nextDNACode = try transaction.fetchCount(From<T>())
+                        for offset in 0 ..< count {
+
+                            let object = transaction.create(Into<T>())
+                            object.dnaCode = .init(nextDNACode + offset)
+                            object.mutate(in: transaction)
+                        }
+                    },
+                    completion: { _ in }
+                )
+            }
+            self.mutateItemAtIndex = { index in
+
+                let object = listPublisher.snapshot[index]
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        object
+                            .asEditable(in: transaction)?
+                            .mutate(in: transaction)
+                    },
+                    completion: { _ in }
+                )
+            }
+            self.deleteAllItems = {
+
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        try transaction.deleteAll(From<T>())
+                    },
+                    completion: { _ in }
+                )
+            }
+            listPublisher.addObserver(self) { [weak self] (listPublisher) in
+
+                self?.objectWillChange.send()
+            }
+        }
+
+        init<T: CoreStoreObject & Advanced.EvolutionDemo.CreatureType>(
+            listPublisher: ListPublisher<T>,
+            dataStack: DataStack
+        ) {
+
+            self.numberOfItems = {
+                listPublisher.snapshot.numberOfItems
+            }
+            self.itemDescriptionAtIndex = { index in
+                listPublisher.snapshot[index].object?.description
+            }
+            self.addItems = { count in
+
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        let nextDNACode = try transaction.fetchCount(From<T>())
+                        for offset in 0 ..< count {
+
+                            let object = transaction.create(Into<T>())
+                            object.dnaCode = .init(nextDNACode + offset)
+                            object.mutate(in: transaction)
+                        }
+                    },
+                    completion: { _ in }
+                )
+            }
+            self.mutateItemAtIndex = { index in
+
+                let object = listPublisher.snapshot[index]
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        object
+                            .asEditable(in: transaction)?
+                            .mutate(in: transaction)
+                    },
+                    completion: { _ in }
+                )
+            }
+            self.deleteAllItems = {
+
+                dataStack.perform(
+                    asynchronous: { transaction in
+
+                        try transaction.deleteAll(From<T>())
+                    },
+                    completion: { _ in }
+                )
+            }
+            listPublisher.addObserver(self) { [weak self] (listPublisher) in
+
+                self?.objectWillChange.send()
+            }
+        }
+
+        func numberOfCreatures() -> Int {
+
+            return self.numberOfItems()
+        }
+
+        func creatureDescription(at index: Int) -> String? {
+
+            return self.itemDescriptionAtIndex(index)
+        }
+
+        func mutate(at index: Int) {
+
+            self.mutateItemAtIndex(index)
+        }
+
+        func add(count: Int) {
+
+            self.addItems(count)
+        }
+
+        func clear() {
+
+            self.deleteAllItems()
+        }
+
+
+        // MARK: Private
+
+        private let numberOfItems: () -> Int
+        private let itemDescriptionAtIndex: (Int) -> String?
+        private let mutateItemAtIndex: (Int) -> Void
+        private let addItems: (Int) -> Void
+        private let deleteAllItems: () -> Void
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.GeologicalPeriod.swift

@@ -0,0 +1,99 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - AdvancedEvolutionDemo
+
+extension Advanced.EvolutionDemo {
+    
+    // MARK: - GeologicalPeriod
+    
+    enum GeologicalPeriod: RawRepresentable, CaseIterable, Hashable, CustomStringConvertible {
+
+
+        // MARK: Internal
+        
+        case ageOfInvertebrates
+        case ageOfFishes
+        case ageOfReptiles
+        case ageOfMammals
+
+        var version: ModelVersion {
+
+            return self.rawValue
+        }
+
+        var creatureType: Advanced.EvolutionDemo.CreatureType.Type {
+
+            switch self {
+
+            case .ageOfInvertebrates:
+                return Advanced.EvolutionDemo.V1.Creature.self
+            case .ageOfFishes:
+                return Advanced.EvolutionDemo.V2.Creature.self
+            case .ageOfReptiles:
+                return Advanced.EvolutionDemo.V3.Creature.self
+            case .ageOfMammals:
+                return Advanced.EvolutionDemo.V4.Creature.self
+            }
+        }
+
+
+        // MARK: CustomStringConvertible
+
+        var description: String {
+
+            switch self {
+
+            case .ageOfInvertebrates:
+                return "Invertebrates"
+            case .ageOfFishes:
+                return "Fishes"
+            case .ageOfReptiles:
+                return "Reptiles"
+            case .ageOfMammals:
+                return "Mammals"
+            }
+        }
+
+
+        // MARK: RawRepresentable
+
+        typealias RawValue = ModelVersion
+
+        var rawValue: ModelVersion {
+
+            switch self {
+
+            case .ageOfInvertebrates:
+                return Advanced.EvolutionDemo.V1.name
+            case .ageOfFishes:
+                return Advanced.EvolutionDemo.V2.name
+            case .ageOfReptiles:
+                return Advanced.EvolutionDemo.V3.name
+            case .ageOfMammals:
+                return Advanced.EvolutionDemo.V4.name
+            }
+        }
+
+        init?(rawValue: ModelVersion) {
+
+            switch rawValue {
+
+            case Advanced.EvolutionDemo.V1.name:
+                self = .ageOfInvertebrates
+            case Advanced.EvolutionDemo.V2.name:
+                self = .ageOfFishes
+            case Advanced.EvolutionDemo.V3.name:
+                self = .ageOfReptiles
+            case Advanced.EvolutionDemo.V4.name:
+                self = .ageOfMammals
+            default:
+                return nil
+            }
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.ItemView.swift

@@ -0,0 +1,75 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    // MARK: - Advanced.EvolutionDemo.ItemView
+
+    struct ItemView: View {
+
+        // MARK: Internal
+
+        init(description: String?, mutate: @escaping () -> Void) {
+            
+            self.description = description
+            self.mutate = mutate
+        }
+
+
+        // MARK: View
+
+        var body: some View {
+            HStack {
+                Text(self.description ?? "")
+                    .font(.footnote)
+                    .foregroundColor(.primary)
+                Spacer()
+                Button(
+                    action: self.mutate,
+                    label: {
+                        Text("Mutate")
+                            .foregroundColor(.accentColor)
+                            .fontWeight(.bold)
+                    }
+                )
+                .buttonStyle(PlainButtonStyle())
+            }
+            .disabled(self.description == nil)
+        }
+
+
+        // MARK: FilePrivate
+
+        fileprivate let description: String?
+        fileprivate let mutate: () -> Void
+    }
+}
+
+#if DEBUG
+
+struct _Demo_Advanced_EvolutionDemo_ItemView_Preview: PreviewProvider {
+
+    // MARK: PreviewProvider
+
+    static var previews: some View {
+        Advanced.EvolutionDemo.ItemView(
+            description: """
+                dnaCode: 123
+                numberOfLimbs: 4
+                hasVertebrae: true
+                hasHead: true
+                hasTail: true
+                habitat: land
+                hasWings: false
+                """,
+            mutate: {}
+        )
+    }
+}
+
+#endif

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.ListView.swift

@@ -0,0 +1,99 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+import SwiftUI
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    // MARK: - Advanced.EvolutionDemo.ListView
+
+    struct ListView: View {
+
+        // MARK: View
+
+        var body: some View {
+            let dataSource = self.dataSource
+            return List {
+                ForEach(0 ..< dataSource.numberOfCreatures(), id: \.self) { (index) in
+                    Advanced.EvolutionDemo.ItemView(
+                        description: dataSource.creatureDescription(at: index),
+                        mutate: {
+
+                            dataSource.mutate(at: index)
+                        }
+                    )
+                }
+            }
+            .listStyle(PlainListStyle())
+        }
+
+
+        // MARK: Internal
+
+        init(
+            period: Advanced.EvolutionDemo.GeologicalPeriod,
+            dataStack: DataStack,
+            dataSource: Advanced.EvolutionDemo.CreaturesDataSource
+        ) {
+
+            self.period = period
+            self.dataStack = dataStack
+            self.dataSource = dataSource
+        }
+
+
+        // MARK: Private
+
+        private let period: Advanced.EvolutionDemo.GeologicalPeriod
+
+        private let dataStack: DataStack
+
+        @ObservedObject
+        private var dataSource: Advanced.EvolutionDemo.CreaturesDataSource
+    }
+}
+
+
+#if DEBUG
+
+struct _Demo_Advanced_EvolutionDemo_ListView_Preview: PreviewProvider {
+
+    // MARK: PreviewProvider
+
+    static var previews: some View {
+
+        let dataStack = DataStack(
+            CoreStoreSchema(
+                modelVersion: Advanced.EvolutionDemo.V4.name,
+                entities: [
+                    Entity<Advanced.EvolutionDemo.V4.Creature>("Creature")
+                ]
+            )
+        )
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(fileName: "Advanced.EvolutionDemo.ListView.Preview.sqlite")
+        )
+        try! dataStack.perform(
+            synchronous: { transaction in
+
+                for dnaCode in 0 ..< 10 as Range<Int64> {
+
+                    let object = transaction.create(Into<Advanced.EvolutionDemo.V4.Creature>())
+                    object.dnaCode = dnaCode
+                    object.mutate(in: transaction)
+                }
+            }
+        )
+        return Advanced.EvolutionDemo.ListView(
+            period: .ageOfMammals,
+            dataStack: dataStack,
+            dataSource: Advanced.EvolutionDemo.V4.Creature.dataSource(in: dataStack)
+        )
+    }
+}
+
+#endif

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.MainView.swift

@@ -0,0 +1,78 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+import SwiftUI
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    // MARK: - Advanced.EvolutionDemo.MainView
+
+    struct MainView: View {
+
+        // MARK: View
+
+        var body: some View {
+            let migrator = self.migrator
+            let listView: AnyView
+            if let current = migrator.current {
+
+                listView = AnyView(
+                    Advanced.EvolutionDemo.ListView(
+                        period: current.period,
+                        dataStack: current.dataStack,
+                        dataSource: current.dataSource
+                    )
+                )
+            }
+            else {
+
+                listView = AnyView(
+                    Advanced.EvolutionDemo.ProgressView(progress: migrator.progress)
+                )
+            }
+
+            return VStack(spacing: 0) {
+                    HStack(alignment: .center, spacing: 0) {
+                        Text("Age of")
+                            .padding(.trailing)
+                        Picker(selection: self.$migrator.currentPeriod, label: EmptyView()) {
+                            ForEach(Advanced.EvolutionDemo.GeologicalPeriod.allCases, id: \.self) { period in
+                                Text(period.description).tag(period)
+                            }
+                        }
+                        .pickerStyle(SegmentedPickerStyle())
+                    }
+                    .padding()
+                    listView
+                        .edgesIgnoringSafeArea(.vertical)
+                }
+                .navigationBarTitle("Evolution")
+                .disabled(migrator.isBusy || migrator.current == nil)
+        }
+
+
+        // MARK: Private
+
+        @ObservedObject
+        private var migrator: Advanced.EvolutionDemo.Migrator = .init()
+    }
+}
+
+
+#if DEBUG
+
+struct _Demo_Advanced_EvolutionDemo_MainView_Preview: PreviewProvider {
+
+    // MARK: PreviewProvider
+
+    static var previews: some View {
+
+        Advanced.EvolutionDemo.MainView()
+    }
+}
+
+#endif

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.ProgressView.swift

@@ -0,0 +1,126 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import SwiftUI
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+
+    // MARK: - Advanced.EvolutionDemo.ProgressView
+
+    struct ProgressView: View {
+
+        // MARK: Internal
+
+        init(progress: Progress?) {
+
+            self.progressObserver = .init(progress)
+        }
+
+
+        // MARK: View
+
+        var body: some View {
+
+            guard self.progressObserver.isMigrating else {
+
+                return AnyView(
+                    VStack(alignment: .center) {
+                        Text("Preparing creatures...")
+                            .padding()
+                        Spacer()
+                    }
+                    .padding()
+                )
+            }
+            return AnyView(
+                VStack(alignment: .leading) {
+                    Text("Migrating: \(self.progressObserver.localizedDescription)")
+                        .font(.headline)
+                        .padding([.top, .horizontal])
+                    Text("Progressive step: \(self.progressObserver.localizedAdditionalDescription)")
+                        .font(.subheadline)
+                        .padding(.horizontal)
+                    GeometryReader { geometry in
+                        ZStack(alignment: .leading) {
+                            RoundedRectangle(cornerRadius: 4, style: .continuous)
+                                .fill(Color.gray.opacity(0.2))
+                                .frame(width: geometry.size.width, height: 8)
+                            RoundedRectangle(cornerRadius: 4, style: .continuous)
+                                .fill(Color.blue)
+                                .frame(
+                                    width: geometry.size.width
+                                        * self.progressObserver.fractionCompleted,
+                                    height: 8
+                                )
+                        }
+                    }
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding()
+                    Spacer()
+                }
+                .padding()
+            )
+        }
+
+
+        // MARK: FilePrivate
+
+        @ObservedObject
+        private var progressObserver: ProgressObserver
+
+
+        // MARK: - ProgressObserver
+
+        fileprivate final class ProgressObserver: ObservableObject {
+
+            private(set) var fractionCompleted: CGFloat = 0
+            private(set) var localizedDescription: String = ""
+            private(set) var localizedAdditionalDescription: String = ""
+
+            var isMigrating: Bool {
+
+                return self.progress != nil
+            }
+
+            init(_ progress: Progress?) {
+
+                self.progress = progress
+
+                progress?.setProgressHandler { [weak self] (progess) in
+
+                    guard let self = self else {
+                        return
+                    }
+                    self.objectWillChange.send()
+                    self.fractionCompleted = CGFloat(progress?.fractionCompleted ?? 0)
+                    self.localizedDescription = progress?.localizedDescription ?? ""
+                    self.localizedAdditionalDescription = progress?.localizedAdditionalDescription ?? ""
+                }
+            }
+
+            // MARK: Private
+
+            private let progress: Progress?
+        }
+    }
+}
+
+#if DEBUG
+
+struct _Demo_Advanced_EvolutionDemo_ProgressView_Preview: PreviewProvider {
+
+    // MARK: PreviewProvider
+
+    static var previews: some View {
+        let progress = Progress(totalUnitCount: 10)
+        progress.completedUnitCount = 3
+        return Advanced.EvolutionDemo.ProgressView(
+            progress: progress
+        )
+    }
+}
+
+#endif

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.Creature.swift

@@ -0,0 +1,63 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import UIKit
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V1.Creature
+
+@objc(Advanced_EvolutionDemo_V1_Creature)
+final class Advanced_EvolutionDemo_V1_Creature: NSManagedObject, Advanced.EvolutionDemo.CreatureType {
+
+    @NSManaged
+    dynamic var dnaCode: Int64
+    
+    @NSManaged
+    dynamic var numberOfFlagella: Int32
+    
+    
+    // MARK: CustomStringConvertible
+    
+    override var description: String {
+        
+        return """
+            dnaCode: \(self.dnaCode)
+            numberOfFlagella: \(self.numberOfFlagella)
+            """
+    }
+    
+    
+    // MARK: Advanced.EvolutionDemo.CreatureType
+
+    static func dataSource(in dataStack: DataStack) -> Advanced.EvolutionDemo.CreaturesDataSource {
+
+        return .init(
+            listPublisher: dataStack.publishList(
+                From<Advanced.EvolutionDemo.V1.Creature>()
+                    .orderBy(.descending(\.dnaCode))
+            ),
+            dataStack: dataStack
+        )
+    }
+
+    static func count(in transaction: BaseDataTransaction) throws -> Int {
+
+        return try transaction.fetchCount(
+            From<Advanced.EvolutionDemo.V1.Creature>()
+        )
+    }
+
+    static func create(in transaction: BaseDataTransaction) -> Advanced.EvolutionDemo.V1.Creature {
+
+        return transaction.create(
+            Into<Advanced.EvolutionDemo.V1.Creature>()
+        )
+    }
+    
+    func mutate(in transaction: BaseDataTransaction) {
+        
+        self.numberOfFlagella = .random(in: 1...200)
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.FromV2.swift

@@ -0,0 +1,27 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V1
+
+extension Advanced.EvolutionDemo.V1 {
+
+    // MARK: - Advanced.EvolutionDemo.V1.FromV2
+
+    enum FromV2 {
+
+        // MARK: Internal
+
+        static var mapping: XcodeSchemaMappingProvider {
+
+            return XcodeSchemaMappingProvider(
+                from: Advanced.EvolutionDemo.V2.name,
+                to: Advanced.EvolutionDemo.V1.name,
+                mappingModelBundle: Bundle(for: Advanced.EvolutionDemo.V1.Creature.self)
+            )
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.swift

@@ -0,0 +1,25 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+    
+    // MARK: - Advanced.EvolutionDemo.V1
+    
+    /**
+    Namespace for V1 models (`Advanced.EvolutionDemo.GeologicalPeriod.ageOfInvertebrates`)
+    */
+    enum V1 {
+        
+        // MARK: Internal
+        
+        static let name: ModelVersion = "Advanced.EvolutionDemo.V1"
+        
+        typealias Creature = Advanced_EvolutionDemo_V1_Creature
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.xcdatamodeld/.xccurrentversion

@@ -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>_XCCurrentVersionName</key>
+	<string>Advanced.EvolutionDemo.V1.xcdatamodel</string>
+</dict>
+</plist>

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.xcdatamodeld/Advanced.EvolutionDemo.V1.xcdatamodel/contents

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Creature" representedClassName="Advanced_EvolutionDemo_V1_Creature" syncable="YES">
+        <attribute name="dnaCode" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="numberOfFlagella" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="YES"/>
+    </entity>
+    <elements>
+        <element name="Creature" positionX="-27" positionY="18" width="128" height="73"/>
+    </elements>
+</model>

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V1.xcdatamodeld/Advanced.EvolutionDemo.V2.xcdatamodel/contents

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Creature" representedClassName="Advanced_EvolutionDemo_V2_Creature" syncable="YES">
+        <attribute name="dnaCode" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="hasVertebrae" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="numberOfFlippers" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="YES"/>
+    </entity>
+    <elements>
+        <element name="Creature" positionX="-9" positionY="36" width="128" height="118"/>
+    </elements>
+</model>

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.Creature.swift

@@ -0,0 +1,78 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import UIKit
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V2.Creature
+
+@objc(Advanced_EvolutionDemo_V2_Creature)
+final class Advanced_EvolutionDemo_V2_Creature: NSManagedObject, Advanced.EvolutionDemo.CreatureType {
+
+    @NSManaged
+    dynamic var dnaCode: Int64
+    
+    @NSManaged
+    dynamic var numberOfFlippers: Int32
+    
+    @NSManaged
+    dynamic var hasVertebrae: Bool
+    
+    @NSManaged
+    dynamic var hasHead: Bool
+    
+    @NSManaged
+    dynamic var hasTail: Bool
+    
+    
+    // MARK: CustomStringConvertible
+    
+    override var description: String {
+        
+        return """
+            dnaCode: \(self.dnaCode)
+            numberOfFlippers: \(self.numberOfFlippers)
+            hasVertebrae: \(self.hasVertebrae)
+            hasHead: \(self.hasHead)
+            hasTail: \(self.hasTail)
+            """
+    }
+    
+    
+    // MARK: Advanced.EvolutionDemo.CreatureType
+
+    static func dataSource(in dataStack: DataStack) -> Advanced.EvolutionDemo.CreaturesDataSource {
+
+        return .init(
+            listPublisher: dataStack.publishList(
+                From<Advanced.EvolutionDemo.V2.Creature>()
+                    .orderBy(.descending(\.dnaCode))
+            ),
+            dataStack: dataStack
+        )
+    }
+
+    static func count(in transaction: BaseDataTransaction) throws -> Int {
+
+        return try transaction.fetchCount(
+            From<Advanced.EvolutionDemo.V2.Creature>()
+        )
+    }
+
+    static func create(in transaction: BaseDataTransaction) -> Advanced.EvolutionDemo.V2.Creature {
+
+        return transaction.create(
+            Into<Advanced.EvolutionDemo.V2.Creature>()
+        )
+    }
+    
+    func mutate(in transaction: BaseDataTransaction) {
+        
+        self.numberOfFlippers = .random(in: 1...4) * 2
+        self.hasVertebrae = .random()
+        self.hasHead = true
+        self.hasTail = .random()
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.FromV1.swift

@@ -0,0 +1,27 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V2
+
+extension Advanced.EvolutionDemo.V2 {
+
+    // MARK: - Advanced.EvolutionDemo.V2.FromV1
+
+    enum FromV1 {
+
+        // MARK: Internal
+
+        static var mapping: XcodeSchemaMappingProvider {
+
+            return XcodeSchemaMappingProvider(
+                from: Advanced.EvolutionDemo.V1.name,
+                to: Advanced.EvolutionDemo.V2.name,
+                mappingModelBundle: Bundle(for: Advanced.EvolutionDemo.V1.Creature.self)
+            )
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.FromV1MigrationPolicy.swift

@@ -0,0 +1,40 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreData
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V2.FromV1MigrationPolicy
+
+@objc(Advanced_EvolutionDemo_V2_FromV1MigrationPolicy)
+final class Advanced_EvolutionDemo_V2_FromV1MigrationPolicy: NSEntityMigrationPolicy {
+
+    // MARK: NSEntityMigrationPolicy
+
+    override func createDestinationInstances(
+        forSource sInstance: NSManagedObject,
+        in mapping: NSEntityMapping,
+        manager: NSMigrationManager
+    ) throws {
+
+        try super.createDestinationInstances(
+            forSource: sInstance,
+            in: mapping,
+            manager: manager
+        )
+
+        for dInstance in manager.destinationInstances(forEntityMappingName: mapping.name, sourceInstances: [sInstance]) {
+
+            dInstance.setValue(
+                Bool.random(),
+                forKey: #keyPath(Advanced.EvolutionDemo.V2.Creature.hasVertebrae)
+            )
+            dInstance.setValue(
+                Bool.random(),
+                forKey: #keyPath(Advanced.EvolutionDemo.V2.Creature.hasTail)
+            )
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.FromV3.swift

@@ -0,0 +1,41 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V2
+
+extension Advanced.EvolutionDemo.V2 {
+
+    // MARK: - Advanced.EvolutionDemo.V2.FromV3
+
+    enum FromV3 {
+
+        // MARK: Internal
+
+        static var mapping: CustomSchemaMappingProvider {
+
+            return CustomSchemaMappingProvider(
+                from: Advanced.EvolutionDemo.V3.name,
+                to: Advanced.EvolutionDemo.V2.name,
+                entityMappings: [
+                    .transformEntity(
+                        sourceEntity: "Creature",
+                        destinationEntity: "Creature",
+                        transformer: { (source, createDestination) in
+
+                            let destination = createDestination()
+                            destination["dnaCode"] = source["dnaCode"]
+                            destination["numberOfFlippers"] = source["numberOfLimbs"]
+                            destination["hasVertebrae"] = source["hasVertebrae"]
+                            destination["hasHead"] = source["hasHead"]
+                            destination["hasTail"] = source["hasTail"]
+                        }
+                    )
+                ]
+            )
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.swift

@@ -0,0 +1,27 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo
+
+extension Advanced.EvolutionDemo {
+    
+    // MARK: - Advanced.EvolutionDemo.V2
+    
+    /**
+    Namespace for V2 models (`Advanced.EvolutionDemo.GeologicalPeriod.ageOfFishes`)
+    */
+    enum V2 {
+        
+        // MARK: Internal
+        
+        static let name: ModelVersion = "Advanced.EvolutionDemo.V2"
+        
+        typealias Creature = Advanced_EvolutionDemo_V2_Creature
+
+        typealias FromV1MigrationPolicy = Advanced_EvolutionDemo_V2_FromV1MigrationPolicy
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V2.xcdatamodeld/Advanced.EvolutionDemo.V2.xcdatamodel/contents

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Creature" representedClassName="Advanced_EvolutionDemo_V2_Creature" syncable="YES">
+        <attribute name="dnaCode" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="hasVertebrae" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
+        <attribute name="numberOfFlippers" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="YES"/>
+    </entity>
+    <elements>
+        <element name="Creature" positionX="-45" positionY="0" width="128" height="118"/>
+    </elements>
+</model>

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V3.Creature.swift

@@ -0,0 +1,103 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import UIKit
+import CoreStore
+
+// MARK: - Advanced.EvolutionDemo.V3
+
+extension Advanced.EvolutionDemo.V3 {
+
+    // MARK: - Advanced.EvolutionDemo.V3.Creature
+
+    final class Creature: CoreStoreObject, Advanced.EvolutionDemo.CreatureType {
+        
+        // MARK: Internal
+
+        @Field.Stored("dnaCode")
+        var dnaCode: Int64 = 0
+
+        @Field.Stored("numberOfLimbs")
+        var numberOfLimbs: Int32 = 0
+
+        @Field.Stored("hasVertebrae")
+        var hasVertebrae: Bool = false
+
+        @Field.Stored("hasHead")
+        var hasHead: Bool = true
+
+        @Field.Stored("hasTail")
+        var hasTail: Bool = true
+
+        @Field.Stored("hasWings")
+        var hasWings: Bool = false
+
+        @Field.Stored("habitat")
+        var habitat: Habitat = .water
+        
+        
+        // MARK: - Habitat
+        
+        enum Habitat: String, CaseIterable, ImportableAttributeType, FieldStorableType {
+            
+            case water = "water"
+            case land = "land"
+            case amphibian = "amphibian"
+        }
+        
+        
+        // MARK: CustomStringConvertible
+        
+        var description: String {
+            
+            return """
+                dnaCode: \(self.dnaCode)
+                numberOfLimbs: \(self.numberOfLimbs)
+                hasVertebrae: \(self.hasVertebrae)
+                hasHead: \(self.hasHead)
+                hasTail: \(self.hasTail)
+                habitat: \(self.habitat)
+                hasWings: \(self.hasWings)
+                """
+        }
+        
+        
+        // MARK: Advanced.EvolutionDemo.CreatureType
+
+        static func dataSource(in dataStack: DataStack) -> Advanced.EvolutionDemo.CreaturesDataSource {
+
+            return .init(
+                listPublisher: dataStack.publishList(
+                    From<Advanced.EvolutionDemo.V3.Creature>()
+                        .orderBy(.descending(\.$dnaCode))
+                ),
+                dataStack: dataStack
+            )
+        }
+
+        static func count(in transaction: BaseDataTransaction) throws -> Int {
+
+            return try transaction.fetchCount(
+                From<Advanced.EvolutionDemo.V3.Creature>()
+            )
+        }
+
+        static func create(in transaction: BaseDataTransaction) -> Advanced.EvolutionDemo.V3.Creature {
+
+            return transaction.create(
+                Into<Advanced.EvolutionDemo.V3.Creature>()
+            )
+        }
+        
+        func mutate(in transaction: BaseDataTransaction) {
+            
+            self.numberOfLimbs = .random(in: 1...4) * 2
+            self.hasVertebrae = .random()
+            self.hasHead = true
+            self.hasTail = .random()
+            self.habitat = Habitat.allCases.randomElement()!
+            self.hasWings = .random()
+        }
+    }
+}

Demo/⭐️Sources/⭐️Demos/⭐️Advanced/⭐️EvolutionDemo/Advanced.EvolutionDemo.V3.FromV2.swift

@@ -0,0 +1,43 @@
+//
+// Demo
+// Copyright © 2020 John Rommel Estropia, Inc. All rights reserved.
+
+import CoreStore
+
+
+// MARK: - Advanced.EvolutionDemo.V3
+
+extension Advanced.EvolutionDemo.V3 {
+
+    // MARK: - Advanced.EvolutionDemo.V3.FromV2
+
+    enum FromV2 {
+
+        // MARK: Internal
+
+        static var mapping: CustomSchemaMappingProvider {
+
+            return CustomSchemaMappingProvider(
+                from: Advanced.EvolutionDemo.V2.name,
+                to: Advanced.EvolutionDemo.V3.name,
+                entityMappings: [
+                    .transformEntity(
+                        sourceEntity: "Creature",
+                        destinationEntity: "Creature",
+                        transformer: { (source, createDestination) in
+
+                            let destination = createDestination()
+                            destination["dnaCode"] = source["dnaCode"]
+                            destination["numberOfLimbs"] = source["numberOfFlippers"]
+                            destination["hasVertebrae"] = source["hasVertebrae"]
+                            destination["hasHead"] = source["hasHead"]
+                            destination["hasTail"] = source["hasTail"]
+                            destination["hasWings"] = Bool.random()
+                            destination["habitat"] = Advanced.EvolutionDemo.V3.Creature.Habitat.allCases.randomElement()!.rawValue
+                        }
+                    )
+                ]
+            )
+        }
+    }
+}