NSExpressionDescription

Author: Revolucent

Sources/CoreDataQueryInterface/NSExpressionDescription.swift

@@ -0,0 +1,22 @@
+//
+//  NSExpressionDescription.swift
+//  CoreDataQueryInterface
+//
+//  Created by Gregory Higley on 2022-10-25.
+//
+
+import CoreData
+import PredicateQI
+
+public extension NSExpressionDescription {
+  convenience init<M: NSObject, V: Expression>(
+    objectKeyPath keyPath: KeyPath<Object<M>, V>,
+    name: String,
+    type: NSAttributeDescription.AttributeType
+  ) {
+    self.init()
+    self.expression = Object<M>()[keyPath: keyPath].pqiExpression
+    self.name = self.name
+    self.resultType = type
+  }
+}

Sources/CoreDataQueryInterface/NSSortDescriptor.swift

@@ -9,8 +9,8 @@ import Foundation
 import PredicateQI
 
 public extension NSSortDescriptor {
-  convenience init<M: NSObject, V: Expression>(objectKeyPath: KeyPath<Object<M>, V>, ascending: Bool) {
-    let expression = Object<M>()[keyPath: objectKeyPath].pqiExpression
+  convenience init<M: NSObject, V: Expression>(objectKeyPath keyPath: KeyPath<Object<M>, V>, ascending: Bool) {
+    let expression = Object<M>()[keyPath: keyPath].pqiExpression
     self.init(key: expression.keyPath, ascending: ascending)
   }
 }

Sources/CoreDataQueryInterface/QueryBuilder+Group.swift

@@ -26,11 +26,7 @@ public extension QueryBuilder {
   }
 
   func group<V: Expression>(by keyPath: KeyPath<Object<M>, V>, name: String, type: NSAttributeDescription.AttributeType) -> QueryBuilder<M, R> {
-    let description = NSExpressionDescription()
-    description.expression = Object<M>()[keyPath: keyPath].pqiExpression
-    description.resultType = type
-    description.name = name
-    return group(by: description)
+    return group(by: NSExpressionDescription(objectKeyPath: keyPath, name: name, type: type))
   }
 
   func group<V: Expression>(by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {

Sources/CoreDataQueryInterface/QueryBuilder+Group.swift.gyb

@@ -31,11 +31,7 @@ public extension QueryBuilder {
   }
 
   func group<V: Expression>(by keyPath: KeyPath<Object<M>, V>, name: String, type: NSAttributeDescription.AttributeType) -> QueryBuilder<M, R> {
-    let description = NSExpressionDescription()
-    description.expression = Object<M>()[keyPath: keyPath].pqiExpression
-    description.resultType = type
-    description.name = name
-    return group(by: description)
+    return group(by: NSExpressionDescription(objectKeyPath: keyPath, name: name, type: type))
   }
 
   func group<V: Expression>(by keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {

Sources/CoreDataQueryInterface/QueryBuilder+Select.swift

@@ -33,11 +33,7 @@ public extension QueryBuilder {
   }
 
   func select<V: Expression>(_ keyPath: KeyPath<Object<M>, V>, name: String, type: NSAttributeDescription.AttributeType) -> QueryBuilder<M, R> {
-    let description = NSExpressionDescription()
-    description.expression = Object<M>()[keyPath: keyPath].pqiExpression
-    description.resultType = type
-    description.name = name
-    return select(description)
+    select(NSExpressionDescription(objectKeyPath: keyPath, name: name, type: type))
   }
 
   func select<V: Expression>(_ keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {

Sources/CoreDataQueryInterface/QueryBuilder+Select.swift.gyb

@@ -38,11 +38,7 @@ public extension QueryBuilder {
   }
 
   func select<V: Expression>(_ keyPath: KeyPath<Object<M>, V>, name: String, type: NSAttributeDescription.AttributeType) -> QueryBuilder<M, R> {
-    let description = NSExpressionDescription()
-    description.expression = Object<M>()[keyPath: keyPath].pqiExpression
-    description.resultType = type
-    description.name = name
-    return select(description)
+    select(NSExpressionDescription(objectKeyPath: keyPath, name: name, type: type))
   }
 
   func select<V: Expression>(_ keyPath: KeyPath<Object<M>, V>) -> QueryBuilder<M, R> {