Where clauses are now more strict with the argument types

Sources/Fetching and Querying/Concrete Clauses/Where.swift

@@ -101,20 +101,44 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init(_ keyPath: KeyPath, isEqualTo value: Any?) {
+    public init(_ keyPath: KeyPath, isEqualTo value: CoreDataNativeType?) {
         
         self.init(value == nil
             ? NSPredicate(format: "\(keyPath) == nil")
             : NSPredicate(format: "\(keyPath) == %@", argumentArray: [value!]))
     }
     
+    /**
+     Initializes a `Where` clause that compares equality
+     
+     - parameter keyPath: the keyPath to compare with
+     - parameter value: the arguments for the `==` operator
+     */
+    public init<T: CoreStoreSupportedAttributeType>(_ keyPath: KeyPath, isEqualTo value: T?) {
+        
+        self.init(value == nil
+            ? NSPredicate(format: "\(keyPath) == nil")
+            : NSPredicate(format: "\(keyPath) == %@", argumentArray: [value!.cs_toNativeType()]))
+    }
+    
     /**
      Initializes a `Where` clause that compares membership
      
      - parameter keyPath: the keyPath to compare with
      - parameter list: the array to check membership of
      */
-    public init(_ keyPath: KeyPath, isMemberOf list: [Any]) {
+    public init(_ keyPath: KeyPath, isMemberOf list: [CoreDataNativeType]) {
+        
+        self.init(NSPredicate(format: "\(keyPath) IN %@", list))
+    }
+    
+    /**
+     Initializes a `Where` clause that compares membership
+     
+     - parameter keyPath: the keyPath to compare with
+     - parameter list: the array to check membership of
+     */
+    public init<T: CoreStoreSupportedAttributeType>(_ keyPath: KeyPath, isMemberOf list: [T]) {
         
         self.init(NSPredicate(format: "\(keyPath) IN %@", list))
     }
@@ -125,7 +149,7 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<S: Sequence>(_ keyPath: KeyPath, isMemberOf list: S) where S.Iterator.Element: Any {
+    public init<S: Sequence>(_ keyPath: KeyPath, isMemberOf list: S) where S.Iterator.Element: CoreStoreSupportedAttributeType {
         
         self.init(NSPredicate(format: "\(keyPath) IN %@", Array(list) as NSArray))
     }

Sources/Importing/CoreDataNativeType.swift

@@ -29,288 +29,44 @@ import CoreData
 
 // MARK: - CoreDataNativeType
 
-public protocol CoreDataNativeType: class, NSObjectProtocol, AnyObject {}
+@objc public protocol CoreDataNativeType: class, NSObjectProtocol, AnyObject {}
+
+
+// MARK: - NSNumber
 
 extension NSNumber: CoreDataNativeType {}
+
+
+// MARK: - NSString
+
 extension NSString: CoreDataNativeType {}
+
+
+// MARK: - NSDate
+
 extension NSDate: CoreDataNativeType {}
+
+
+// MARK: - NSData
+
 extension NSData: CoreDataNativeType {}
+
+
+// MARK: - NSSet
+
 extension NSSet: CoreDataNativeType {}
+
+
+// MARK: - NSOrderedSet
+
 extension NSOrderedSet: CoreDataNativeType {}
 
 
-public protocol CoreStoreSupportedAttributeType {
-    
-    associatedtype CoreStoreNativeType: CoreDataNativeType
-    
-    static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self?
-    func cs_toNativeType() -> CoreStoreNativeType
-}
+// MARK: - NSManagedObject
 
-extension NSNumber: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSNumber>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
-
-extension NSString: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSString
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSString>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
-
-extension NSDate: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSDate
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSDate>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
-
-extension NSData: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSData
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSData>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
-
-extension NSSet: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSSet
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSSet>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
-
-extension NSOrderedSet: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSOrderedSet
-    
-    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
-        
-        func forceCast<T: NSOrderedSet>(_ value: Any) -> T? {
-            
-            return value as? T
-        }
-        return forceCast(value)
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self
-    }
-}
+extension NSManagedObject: CoreDataNativeType {}
 
 
+// MARK: - NSManagedObjectID
 
-extension Bool: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Bool? {
-        
-        return value.boolValue
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Int16: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int16? {
-        
-        return value.int16Value
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Int32: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int32? {
-        
-        return value.int32Value
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Int64: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int64? {
-        
-        return value.int64Value
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Double: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Double? {
-        
-        return value.doubleValue
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Float: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSNumber
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Float? {
-        
-        return value.floatValue
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSNumber
-    }
-}
-
-extension Date: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSDate
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Date? {
-        
-        return value as Date
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSDate
-    }
-}
-
-extension String: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSString
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> String? {
-        
-        return value as String
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSString
-    }
-}
-
-extension Data: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSData
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Data? {
-        
-        return value as Data
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSData
-    }
-}
-
-extension Set: CoreStoreSupportedAttributeType {
-    
-    public typealias CoreStoreNativeType = NSSet
-    
-    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Set? {
-        
-        return value as? Set
-    }
-    
-    public func cs_toNativeType() -> CoreStoreNativeType {
-        
-        return self as NSSet
-    }
-}
-
-
+extension NSManagedObjectID: CoreDataNativeType {}

Sources/Importing/CoreStoreSupportedAttributeType.swift

@@ -0,0 +1,372 @@
+//
+//  CoreStoreSupportedAttributeType.swift
+//  CoreStore
+//
+//  Copyright © 2017 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - CoreStoreSupportedAttributeType
+
+public protocol CoreStoreSupportedAttributeType: Hashable {
+    
+    associatedtype CoreStoreNativeType: CoreDataNativeType
+    
+    static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self?
+    func cs_toNativeType() -> CoreStoreNativeType
+}
+
+
+// MARK: - NSManagedObject
+
+extension NSManagedObject: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSManagedObject
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSManagedObject>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSNumber
+
+extension NSNumber: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSNumber>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSString
+
+extension NSString: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSString
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSString>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSDate
+
+extension NSDate: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSDate
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSDate>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSData
+
+extension NSData: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSData
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSData>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSSet
+
+extension NSSet: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSSet
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSSet>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - NSOrderedSet
+
+extension NSOrderedSet: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSOrderedSet
+    
+    public class func cs_fromNativeType(_ value: CoreStoreNativeType) -> Self? {
+        
+        func forceCast<T: NSOrderedSet>(_ value: Any) -> T? {
+            
+            return value as? T
+        }
+        return forceCast(value)
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self
+    }
+}
+
+
+// MARK: - Bool
+
+extension Bool: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Bool? {
+        
+        return value.boolValue
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Int16
+
+extension Int16: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int16? {
+        
+        return value.int16Value
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Int32
+
+extension Int32: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int32? {
+        
+        return value.int32Value
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Int64
+
+extension Int64: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int64? {
+        
+        return value.int64Value
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Double
+
+extension Double: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Double? {
+        
+        return value.doubleValue
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Float
+
+extension Float: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSNumber
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Float? {
+        
+        return value.floatValue
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSNumber
+    }
+}
+
+
+// MARK: - Date
+
+extension Date: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSDate
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Date? {
+        
+        return value as Date
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSDate
+    }
+}
+
+
+// MARK: - String
+
+extension String: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSString
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> String? {
+        
+        return value as String
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSString
+    }
+}
+
+
+// MARK: - Data
+
+extension Data: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSData
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Data? {
+        
+        return value as Data
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSData
+    }
+}
+
+
+// MARK: - Set
+
+extension Set: CoreStoreSupportedAttributeType {
+    
+    public typealias CoreStoreNativeType = NSSet
+    
+    public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Set? {
+        
+        return value as? Set
+    }
+    
+    public func cs_toNativeType() -> CoreStoreNativeType {
+        
+        return self as NSSet
+    }
+}

Sources/ObjectiveC/CSWhere.swift

@@ -85,7 +85,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
      - parameter value: the arguments for the `==` operator
      */
     @objc
-    public convenience init(keyPath: KeyPath, isEqualTo value: NSObject?) {
+    public convenience init(keyPath: KeyPath, isEqualTo value: CoreDataNativeType?) {
         
         self.init(Where(keyPath, isEqualTo: value))
     }
@@ -97,7 +97,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
      - parameter list: the array to check membership of
      */
     @objc
-    public convenience init(keyPath: KeyPath, isMemberOf list: [NSObject]) {
+    public convenience init(keyPath: KeyPath, isMemberOf list: [CoreDataNativeType]) {
         
         self.init(Where(keyPath, isMemberOf: list))
     }