NSSortDescriptor

Revolucent · Revolucent · commit 71a15a0c2622 · 2022-10-25T00:56:14.000-04:00
diff --git a/Sources/CoreDataQueryInterface/QueryBuilder+Order.swift b/Sources/CoreDataQueryInterface/QueryBuilder+Order.swift
@@ -28,10 +28,7 @@ public extension QueryBuilder {
   }
   
   func order<V: Expression>(_ direction: SortDirection = .ascending, by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {
-    let sortDescriptor = NSSortDescriptor(objectKeyPath: keyPath, ascending: direction.isAscending)
-    var query = self
-    query.sortDescriptors.append(sortDescriptor)
-    return query
+    order(by: .init(objectKeyPath: keyPath, ascending: direction.isAscending))
   }
 
   func order<V1: Expression, V2: Expression>(
diff --git a/Sources/CoreDataQueryInterface/QueryBuilder+Order.swift.gyb b/Sources/CoreDataQueryInterface/QueryBuilder+Order.swift.gyb
@@ -33,10 +33,7 @@ public extension QueryBuilder {
   }
   
   func order<V: Expression>(_ direction: SortDirection = .ascending, by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {
-    let sortDescriptor = NSSortDescriptor(objectKeyPath: keyPath, ascending: direction.isAscending)
-    var query = self
-    query.sortDescriptors.append(sortDescriptor)
-    return query
+    order(by: .init(objectKeyPath: keyPath, ascending: direction.isAscending))
   }
 % for i in range(2, 8):
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,7 @@ public extension QueryBuilder {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func order<V: Expression>(_ direction: SortDirection = .ascending, by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {`
`31`		`- let sortDescriptor = NSSortDescriptor(objectKeyPath: keyPath, ascending: direction.isAscending)`
`32`		`- var query = self`
`33`		`- query.sortDescriptors.append(sortDescriptor)`
`34`		`- return query`
	`31`	`+ order(by: .init(objectKeyPath: keyPath, ascending: direction.isAscending))`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`func order<V1: Expression, V2: Expression>(`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,7 @@ public extension QueryBuilder {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func order<V: Expression>(_ direction: SortDirection = .ascending, by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {`
`36`		`- let sortDescriptor = NSSortDescriptor(objectKeyPath: keyPath, ascending: direction.isAscending)`
`37`		`- var query = self`
`38`		`- query.sortDescriptors.append(sortDescriptor)`
`39`		`- return query`
	`36`	`+ order(by: .init(objectKeyPath: keyPath, ascending: direction.isAscending))`
`40`	`37`	`}`
`41`	`38`	`% for i in range(2, 8):`
`42`	`39`