Skip to content

Commit 1c44bc6

Browse files
colemancdacolemancda
committed
Renamed Expression 
1 parent e8ecfb6 commit 1c44bc6

4 files changed

Lines changed: 49 additions & 43 deletions

File tree

‎Sources/CoreDataModel/NSPredicate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public extension FetchRequest.Predicate.Comparison.Option {
113113
}
114114
}
115115

116-
public extension Expression {
116+
public extension FetchRequest.Predicate.Expression {
117117

118118
func toFoundation() -> NSExpression {
119119

‎Sources/CoreModel/Predicate/Comparison.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ extension FetchRequest.Predicate.Comparison: CustomStringConvertible {
134134

135135
// MARK: - Operators
136136

137-
public func < (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
137+
public func < (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
138138

139139
let comparison = FetchRequest.Predicate.Comparison(
140140
left: lhs,
@@ -144,7 +144,7 @@ public func < (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
144144
return .comparison(comparison)
145145
}
146146

147-
public func <= (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
147+
public func <= (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
148148

149149
let comparison = FetchRequest.Predicate.Comparison(left: lhs,
150150
right: rhs,
@@ -153,7 +153,7 @@ public func <= (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
153153
return .comparison(comparison)
154154
}
155155

156-
public func > (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
156+
public func > (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
157157

158158
let comparison = FetchRequest.Predicate.Comparison(left: lhs,
159159
right: rhs,
@@ -162,7 +162,7 @@ public func > (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
162162
return .comparison(comparison)
163163
}
164164

165-
public func >= (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
165+
public func >= (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
166166

167167
let comparison = FetchRequest.Predicate.Comparison(left: lhs,
168168
right: rhs,
@@ -171,7 +171,7 @@ public func >= (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
171171
return .comparison(comparison)
172172
}
173173

174-
public func == (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
174+
public func == (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
175175

176176
let comparison = FetchRequest.Predicate.Comparison(left: lhs,
177177
right: rhs,
@@ -180,7 +180,7 @@ public func == (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
180180
return .comparison(comparison)
181181
}
182182

183-
public func != (lhs: Expression, rhs: Expression) -> FetchRequest.Predicate {
183+
public func != (lhs: FetchRequest.Predicate.Expression, rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
184184

185185
let comparison = FetchRequest.Predicate.Comparison(left: lhs,
186186
right: rhs,
@@ -248,19 +248,19 @@ public func != <T: AttributeEncodable> (lhs: String, rhs: T) -> FetchRequest.Pre
248248
// Extensions for KeyPath comparisons
249249
public extension String {
250250

251-
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ rhs: Expression) -> FetchRequest.Predicate {
251+
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
252252

253253
let comparison = FetchRequest.Predicate.Comparison(left: .keyPath(.init(rawValue: self)), right: rhs, type: type)
254254
return .comparison(comparison)
255255
}
256256

257-
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: Expression) -> FetchRequest.Predicate {
257+
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
258258

259259
let comparison = FetchRequest.Predicate.Comparison(left: .keyPath(.init(rawValue: self)), right: rhs, type: type, options: options)
260260
return .comparison(comparison)
261261
}
262262

263-
func compare(_ modifier: FetchRequest.Predicate.Comparison.Modifier, _ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: Expression) -> FetchRequest.Predicate {
263+
func compare(_ modifier: FetchRequest.Predicate.Comparison.Modifier, _ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
264264

265265
let comparison = FetchRequest.Predicate.Comparison(left: .keyPath(.init(rawValue: self)), right: rhs, type: type, modifier: modifier, options: options)
266266
return .comparison(comparison)

‎Sources/CoreModel/Predicate/Expression.swift‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,33 @@
66
// Copyright © 2017 PureSwift. All rights reserved.
77
//
88

9-
/// Used to represent expressions in a predicate.
10-
public enum Expression: Equatable, Hashable, Sendable {
9+
public extension FetchRequest.Predicate {
1110

12-
/// Expression that represents a given constant attribute value.
13-
case attribute(AttributeValue)
14-
15-
/// Expression that represents a given constant attribute value.
16-
case relationship(RelationshipValue)
17-
18-
/// Expression that invokes `value​For​Key​Path:​` with a given key path.
19-
case keyPath(PredicateKeyPath)
20-
}
21-
22-
/// Type of predicate expression.
23-
public enum ExpressionType: String, Codable, Sendable {
11+
/// Used to represent expressions in a predicate.
12+
enum Expression: Equatable, Hashable, Sendable {
13+
14+
/// Expression that represents a given constant attribute value.
15+
case attribute(AttributeValue)
16+
17+
/// Expression that represents a given constant attribute value.
18+
case relationship(RelationshipValue)
19+
20+
/// Expression that invokes `value​For​Key​Path:​` with a given key path.
21+
case keyPath(PredicateKeyPath)
22+
}
2423

25-
case attribute
26-
case relationship
27-
case keyPath
24+
/// Type of predicate expression.
25+
enum ExpressionType: String, Codable, Sendable {
26+
27+
case attribute
28+
case relationship
29+
case keyPath
30+
}
2831
}
2932

30-
public extension Expression {
33+
public extension FetchRequest.Predicate.Expression {
3134

32-
var type: ExpressionType {
35+
var type: FetchRequest.Predicate.ExpressionType {
3336
switch self {
3437
case .attribute: return .attribute
3538
case .relationship: return .relationship
@@ -40,7 +43,7 @@ public extension Expression {
4043

4144
// MARK: - CustomStringConvertible
4245

43-
extension Expression: CustomStringConvertible {
46+
extension FetchRequest.Predicate.Expression: CustomStringConvertible {
4447

4548
public var description: String {
4649

@@ -91,7 +94,7 @@ internal extension RelationshipValue {
9194

9295
// MARK: - Codable
9396

94-
extension Expression: Codable {
97+
extension FetchRequest.Predicate.Expression: Codable {
9598

9699
internal enum CodingKeys: String, CodingKey {
97100

@@ -102,7 +105,7 @@ extension Expression: Codable {
102105
public init(from decoder: Decoder) throws {
103106

104107
let container = try decoder.container(keyedBy: CodingKeys.self)
105-
let type = try container.decode(ExpressionType.self, forKey: .type)
108+
let type = try container.decode(FetchRequest.Predicate.ExpressionType.self, forKey: .type)
106109

107110
switch type {
108111
case .attribute:
@@ -135,21 +138,21 @@ extension Expression: Codable {
135138

136139
// MARK: - Extensions
137140

138-
public extension Expression {
141+
public extension FetchRequest.Predicate.Expression {
139142

140-
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ rhs: Expression) -> FetchRequest.Predicate {
143+
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
141144

142145
let comparison = FetchRequest.Predicate.Comparison(left: self, right: rhs, type: type)
143146
return .comparison(comparison)
144147
}
145148

146-
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: Expression) -> FetchRequest.Predicate {
149+
func compare(_ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
147150

148151
let comparison = FetchRequest.Predicate.Comparison(left: self, right: rhs, type: type, options: options)
149152
return .comparison(comparison)
150153
}
151154

152-
func compare(_ modifier: FetchRequest.Predicate.Comparison.Modifier, _ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: Expression) -> FetchRequest.Predicate {
155+
func compare(_ modifier: FetchRequest.Predicate.Comparison.Modifier, _ type: FetchRequest.Predicate.Comparison.Operator, _ options: Set<FetchRequest.Predicate.Comparison.Option>, _ rhs: FetchRequest.Predicate.Expression) -> FetchRequest.Predicate {
153156

154157
let comparison = FetchRequest.Predicate.Comparison(left: self, right: rhs, type: type, modifier: modifier, options: options)
155158
return .comparison(comparison)

‎Sources/CoreModel/Predicate/Predicate.swift‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,21 @@ public extension FetchRequest {
1818
}
1919
}
2020

21-
/// Predicate Type
22-
public enum PredicateType: String, Codable, Sendable {
21+
public extension FetchRequest {
2322

24-
case comparison
25-
case compound
26-
case value
23+
/// Predicate Type
24+
enum PredicateType: String, Codable, Sendable {
25+
26+
case comparison
27+
case compound
28+
case value
29+
}
2730
}
2831

2932
public extension FetchRequest.Predicate {
3033

3134
/// Predicate Type
32-
var type: PredicateType {
35+
var type: FetchRequest.PredicateType {
3336
switch self {
3437
case .comparison: return .comparison
3538
case .compound: return .compound
@@ -65,7 +68,7 @@ extension FetchRequest.Predicate: Codable {
6568
public init(from decoder: Decoder) throws {
6669

6770
let container = try decoder.container(keyedBy: CodingKeys.self)
68-
let type = try container.decode(PredicateType.self, forKey: .type)
71+
let type = try container.decode(FetchRequest.PredicateType.self, forKey: .type)
6972

7073
switch type {
7174
case .comparison:

0 commit comments

Comments
 (0)