starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-14 13:13:33 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

renamed Field.Computed to Field.Virtual to distinguish from Field.Derived

Browse Source
This commit is contained in:
John Estropia
2020-02-06 09:33:08 +09:00
parent e9c3312612
commit f0f4049798
10 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CoreStore.xcodeproj/project.pbxproj
View File

@@ -603,10 +603,10 @@
B56E4EE023CEBCF000E1708C /* FieldOptionalType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EDE23CEBCF000E1708C /* FieldOptionalType.swift */; };
B56E4EE123CEBCF000E1708C /* FieldOptionalType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EDE23CEBCF000E1708C /* FieldOptionalType.swift */; };
B56E4EE223CEBCF000E1708C /* FieldOptionalType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EDE23CEBCF000E1708C /* FieldOptionalType.swift */; };
B56E4EE423CEDF0900E1708C /* Field.Computed.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Computed.swift */; };
B56E4EE523CEDF0900E1708C /* Field.Computed.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Computed.swift */; };
B56E4EE623CEDF0900E1708C /* Field.Computed.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Computed.swift */; };
B56E4EE723CEDF0900E1708C /* Field.Computed.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Computed.swift */; };
B56E4EE423CEDF0900E1708C /* Field.Virtual.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */; };
B56E4EE523CEDF0900E1708C /* Field.Virtual.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */; };
B56E4EE623CEDF0900E1708C /* Field.Virtual.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */; };
B56E4EE723CEDF0900E1708C /* Field.Virtual.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */; };
B57D27BE1D0BBE8200539C58 /* BaseTestDataTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */; };
B57D27BF1D0BBE8200539C58 /* BaseTestDataTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */; };
B57D27C01D0BBE8200539C58 /* BaseTestDataTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */; };
@@ -1122,7 +1122,7 @@
B56E4ED323CDB54A00E1708C /* FieldProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FieldProtocol.swift; sourceTree = "<group>"; };
B56E4ED823CEB8E700E1708C /* FieldStorableType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FieldStorableType.swift; sourceTree = "<group>"; };
B56E4EDE23CEBCF000E1708C /* FieldOptionalType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FieldOptionalType.swift; sourceTree = "<group>"; };
B56E4EE323CEDF0900E1708C /* Field.Computed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Field.Computed.swift; sourceTree = "<group>"; };
B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Field.Virtual.swift; sourceTree = "<group>"; };
B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTestDataTestCase.swift; sourceTree = "<group>"; };
B57D27C11D0BC20100539C58 /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
B57E6FA123D302FA000FD031 /* Field.Relationship.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Field.Relationship.swift; sourceTree = "<group>"; };
@@ -1622,7 +1622,7 @@
children = (
B56E4EC923CD9B4800E1708C /* Field.swift */,
B56E4ECE23CD9E4200E1708C /* Field.Stored.swift */,
B56E4EE323CEDF0900E1708C /* Field.Computed.swift */,
B56E4EE323CEDF0900E1708C /* Field.Virtual.swift */,
B50C3EE423D153EA00B29880 /* Field.Coded.swift */,
B57E6FA123D302FA000FD031 /* Field.Relationship.swift */,
B50C3EDE23D05BB200B29880 /* Coders */,
@@ -2408,7 +2408,7 @@
B5FAD6A91B50A4B400714891 /* Progress+Convenience.swift in Sources */,
B5E84EFC1AFF846E0064E85B /* SynchronousDataTransaction.swift in Sources */,
B5215CA91FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
B56E4EE423CEDF0900E1708C /* Field.Computed.swift in Sources */,
B56E4EE423CEDF0900E1708C /* Field.Virtual.swift in Sources */,
B50E174D23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
B5E222231CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift in Sources */,
B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */,
@@ -2659,7 +2659,7 @@
B514EF0F23A8DB180093DBA4 /* DiffableDataSource.Target.swift in Sources */,
B52F744B1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
B56E4EE523CEDF0900E1708C /* Field.Computed.swift in Sources */,
B56E4EE523CEDF0900E1708C /* Field.Virtual.swift in Sources */,
B5E2222C1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */,
82BA18A71C4BBD2900A0916E /* CoreStore+Logging.swift in Sources */,
B50E174E23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
@@ -2910,7 +2910,7 @@
B514EF1123A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */,
B50E175A23517DE4004F033C /* Differentiable.swift in Sources */,
B52F744D1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
B56E4EE723CEDF0900E1708C /* Field.Computed.swift in Sources */,
B56E4EE723CEDF0900E1708C /* Field.Virtual.swift in Sources */,
B52DD19A1BE1F92800949AFE /* CoreStore+Logging.swift in Sources */,
B52DD1A71BE1F93200949AFE /* BaseDataTransaction+Querying.swift in Sources */,
B546F96C1C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
@@ -3161,7 +3161,7 @@
B514EF1023A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */,
B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */,
B52F744C1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
B56E4EE623CEDF0900E1708C /* Field.Computed.swift in Sources */,
B56E4EE623CEDF0900E1708C /* Field.Virtual.swift in Sources */,
B5AEFAB71C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
B5E2222D1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */,
B50E174F23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,

4
CoreStoreTests/DynamicModelTests.swift
View File

@@ -100,14 +100,14 @@ class Person: CoreStoreObject {
@Field.Stored("name", customSetter: Person.setName(_:_:))
var name: String = ""
@Field.Computed(
@Field.Virtual(
"displayName",
customGetter: Person.getDisplayName(_:),
affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
)
var displayName: String?
@Field.Computed(
@Field.Virtual(
"customType",
customGetter: Person.getCustomField(_:)
)

3
Sources/DynamicObject.swift
View File

@@ -114,7 +114,8 @@ extension NSManagedObject: DynamicObject {
public class func cs_fromRaw(object: NSManagedObject) -> Self {
return unsafeDowncast(object, to: self)
// unsafeDowncast fails debug assertion starting Swift 5.2
return _unsafeUncheckedDowncast(object, to: self)
}
public static func cs_matches(object: NSManagedObject) -> Bool {

2
Sources/DynamicSchema+Convenience.swift
View File

@@ -70,7 +70,7 @@ extension DynamicSchema {
let containerType: String
if attribute.isTransient || attribute.attributeType == .undefinedAttributeType {
containerType = "Field.Computed"
containerType = "Field.Virtual"
}
else if attribute.attributeType == .transformableAttributeType {

8
Sources/Field.Coded.swift
View File

@@ -40,7 +40,7 @@ extension FieldContainer {
@Field.Stored("species")
var species = ""
@Field.Computed("pluralName", customGetter: Animal.pluralName(_:))
@Field.Virtual("pluralName", customGetter: Animal.pluralName(_:))
var pluralName: String = ""
@Field.PlistCoded("color")
@@ -62,7 +62,7 @@ extension FieldContainer {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {
@@ -366,7 +366,7 @@ extension FieldContainer.Coded where V: FieldOptionalType {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {
@@ -454,7 +454,7 @@ extension FieldContainer.Coded where V: DefaultNSSecureCodable {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {

6
Sources/Field.Stored.swift
View File

@@ -40,7 +40,7 @@ extension FieldContainer {
@Field.Stored("species")
var species = ""
@Field.Computed("pluralName", customGetter: Animal.pluralName(_:))
@Field.Virtual("pluralName", customGetter: Animal.pluralName(_:))
var pluralName: String = ""
@Field.PlistCoded("color")
@@ -62,7 +62,7 @@ extension FieldContainer {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {
@@ -320,7 +320,7 @@ extension FieldContainer.Stored where V: FieldOptionalType {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {

33
Sources/Field.Computed.swift → Sources/Field.Virtual.swift
View File

@@ -1,5 +1,5 @@
//
// Field.Computed.swift
// Field.Virtual.swift
// CoreStore
//
// Copyright © 2020 John Rommel Estropia
@@ -31,7 +31,7 @@ import Foundation
extension FieldContainer {
// MARK: - Computed
// MARK: - Virtual
/**
The containing type for computed property values. Any type that conforms to `FieldStorableType` are supported.
@@ -40,17 +40,17 @@ extension FieldContainer {
@Field.Stored("species")
var species = ""
@Field.Computed("pluralName", customGetter: Animal.pluralName(_:))
@Field.Virtual("pluralName", customGetter: Animal.pluralName(_:))
var pluralName: String = ""
@Field.PlistCoded("color")
var color: UIColor?
}
```
- Important: `Field` properties are required to be used as `@propertyWrapper`s. Any other declaration not using the `@Field.Computed(...) var` syntax will be ignored.
- Important: `Field` properties are required to be used as `@propertyWrapper`s. Any other declaration not using the `@Field.Virtual(...) var` syntax will be ignored.
*/
@propertyWrapper
public struct Computed<V>: AttributeKeyPathStringConvertible, FieldAttributeProtocol {
public struct Virtual<V>: AttributeKeyPathStringConvertible, FieldAttributeProtocol {
/**
Initializes the metadata for the property.
@@ -62,7 +62,7 @@ extension FieldContainer {
@Field.Stored("name")
var name: String = ""
@Field.Computed("displayName", customGetter: Person.getName(_:))
@Field.Virtual("displayName", customGetter: Person.getName(_:))
var displayName: String = ""
private static func getName(_ partialObject: PartialObject<Person>) -> String {
@@ -85,7 +85,7 @@ extension FieldContainer {
*/
public init(
_ keyPath: KeyPathString,
customGetter: ((_ partialObject: PartialObject<O>) -> V)? = nil,
customGetter: @escaping (_ partialObject: PartialObject<O>) -> V,
customSetter: ((_ partialObject: PartialObject<O>, _ newValue: V) -> Void)? = nil,
affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []) {
@@ -299,3 +299,22 @@ extension FieldContainer {
private let customSetter: ((_ partialObject: PartialObject<O>, _ newValue: V) -> Void)?
}
}
extension FieldContainer.Virtual where V: FieldOptionalType {
public init(
_ keyPath: KeyPathString,
customGetter: ((_ partialObject: PartialObject<O>) -> V)? = nil,
customSetter: ((_ partialObject: PartialObject<O>, _ newValue: V) -> Void)? = nil,
affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []) {
self.init(
keyPath: keyPath,
isOptional: false,
customGetter: customGetter,
customSetter: customSetter,
affectedByKeyPaths: affectedByKeyPaths
)
}
}

4
Sources/ObjectPublisher.swift
View File

@@ -385,7 +385,7 @@ extension ObjectPublisher where O: CoreStoreObject {
/**
Returns the value for the property identified by a given key.
*/
public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Computed<V>>) -> V? {
public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) -> V? {
guard
let object = self.object,
@@ -394,7 +394,7 @@ extension ObjectPublisher where O: CoreStoreObject {
return nil
}
return FieldContainer<OBase>.Computed<V>.read(field: object[keyPath: member], for: rawObject) as! V?
return FieldContainer<OBase>.Virtual<V>.read(field: object[keyPath: member], for: rawObject) as! V?
}
/**

2
Sources/ObjectSnapshot.swift
View File

@@ -195,7 +195,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
/**
Returns the value for the property identified by a given key.
*/
public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Computed<V>>) -> V {
public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) -> V {
get {

6
Sources/PartialObject.swift
View File

@@ -58,7 +58,7 @@ public struct PartialObject<O: CoreStoreObject> {
/**
Returns the value for the property identified by a given key.
*/
public func value<V>(for property: (O) -> FieldContainer<O>.Computed<V>) -> V {
public func value<V>(for property: (O) -> FieldContainer<O>.Virtual<V>) -> V {
switch self.rawObject.value(forKey: property(O.meta).keyPath) {
@@ -89,7 +89,7 @@ public struct PartialObject<O: CoreStoreObject> {
This method does not invoke the access notification methods (`willAccessValue(forKey:)` and `didAccessValue(forKey:)`). This method is used primarily by subclasses that implement custom accessor methods that need direct access to the receiver’s private storage.
*/
public func primitiveValue<V>(for property: (O) -> FieldContainer<O>.Computed<V>) -> V? {
public func primitiveValue<V>(for property: (O) -> FieldContainer<O>.Virtual<V>) -> V? {
switch self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) {
@@ -145,7 +145,7 @@ public struct PartialObject<O: CoreStoreObject> {
Sets in the receiver’s private internal storage the value of the property specified by key to value.
*/
public func setPrimitiveValue<V>(_ value: V, for property: (O) -> FieldContainer<O>.Computed<V>) {
public func setPrimitiveValue<V>(_ value: V, for property: (O) -> FieldContainer<O>.Virtual<V>) {
self.rawObject.setPrimitiveValue(
value,