From f380d9dc25453df5a1985fef2f49ebae4afdbecb Mon Sep 17 00:00:00 2001 From: John Estropia Date: Fri, 25 Oct 2019 12:36:13 +0900 Subject: [PATCH] ObjectSnapshot: allow dynamicMember keyPaths from superclasses --- Sources/ObjectPublisher.swift | 14 +++++++------- Sources/ObjectSnapshot.swift | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift index 0b3aec1..be59366 100644 --- a/Sources/ObjectPublisher.swift +++ b/Sources/ObjectPublisher.swift @@ -354,7 +354,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Required>) -> V? { + public subscript(dynamicMember member: KeyPath.Required>) -> V? { return self.object?[keyPath: member].value } @@ -362,7 +362,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Optional>) -> V? { + public subscript(dynamicMember member: KeyPath.Optional>) -> V? { return self.object?[keyPath: member].value } @@ -370,7 +370,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Required>) -> V? { + public subscript(dynamicMember member: KeyPath.Required>) -> V? { return self.object?[keyPath: member].value } @@ -378,7 +378,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Optional>) -> V? { + public subscript(dynamicMember member: KeyPath.Optional>) -> V? { return self.object?[keyPath: member].value } @@ -386,7 +386,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToOne>) -> D? { + public subscript(dynamicMember member: KeyPath.ToOne>) -> D? { return self.object?[keyPath: member].value } @@ -394,7 +394,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToManyOrdered>) -> [D]? { + public subscript(dynamicMember member: KeyPath.ToManyOrdered>) -> [D]? { return self.object?[keyPath: member].value } @@ -402,7 +402,7 @@ extension ObjectPublisher where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToManyUnordered>) -> Set? { + public subscript(dynamicMember member: KeyPath.ToManyUnordered>) -> Set? { return self.object?[keyPath: member].value } diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift index dc94e1c..811cbda 100644 --- a/Sources/ObjectSnapshot.swift +++ b/Sources/ObjectSnapshot.swift @@ -146,7 +146,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Required>) -> V { + public subscript(dynamicMember member: KeyPath.Required>) -> V { get { @@ -163,7 +163,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Optional>) -> V? { + public subscript(dynamicMember member: KeyPath.Optional>) -> V? { get { @@ -180,7 +180,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Required>) -> V { + public subscript(dynamicMember member: KeyPath.Required>) -> V { get { @@ -197,7 +197,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.Optional>) -> V? { + public subscript(dynamicMember member: KeyPath.Optional>) -> V? { get { @@ -214,7 +214,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToOne>) -> D.ObjectID? { + public subscript(dynamicMember member: KeyPath.ToOne>) -> D.ObjectID? { get { @@ -231,7 +231,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToManyOrdered>) -> [D.ObjectID] { + public subscript(dynamicMember member: KeyPath.ToManyOrdered>) -> [D.ObjectID] { get { @@ -248,7 +248,7 @@ extension ObjectSnapshot where O: CoreStoreObject { /** Returns the value for the property identified by a given key. */ - public subscript(dynamicMember member: KeyPath.ToManyUnordered>) -> Set { + public subscript(dynamicMember member: KeyPath.ToManyUnordered>) -> Set { get {