Use type-safe keypath constructor in PFQueryState.

Author: nlutsenko

Parse/Internal/Query/State/PFMutableQueryState.m

@@ -11,6 +11,7 @@
 #import "PFQueryConstants.h"
 
 #import "PFQueryState_Private.h"
+#import "PFMacros.h"
 
 @interface PFMutableQueryState () {
     NSMutableDictionary<NSString *, id> *_conditions;
@@ -47,10 +48,10 @@ @implementation PFMutableQueryState
 + (NSDictionary *)propertyAttributes {
     NSMutableDictionary *attributes = [[super propertyAttributes] mutableCopy];
 
-    attributes[@"conditions"] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
-    attributes[@"sortKeys"] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
-    attributes[@"includedKeys"] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
-    attributes[@"extraOptions"] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
+    attributes[PFQueryStatePropertyName(conditions)] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
+    attributes[PFQueryStatePropertyName(sortKeys)] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
+    attributes[PFQueryStatePropertyName(includedKeys)] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
+    attributes[PFQueryStatePropertyName(extraOptions)] = [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeMutableCopy];
 
     return attributes;
 }

Parse/Internal/Query/State/PFQueryState.m

@@ -12,6 +12,7 @@
 
 #import "PFMutableQueryState.h"
 #import "PFPropertyInfo.h"
+#import "PFMacros.h"
 
 @implementation PFQueryState
 
@@ -21,24 +22,24 @@ @implementation PFQueryState
 
 + (NSDictionary *)propertyAttributes {
     return @{
-        @"parseClassName": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-        @"conditions": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-        @"sortKeys": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-        @"includedKeys": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-        @"selectedKeys": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-        @"extraOptions": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
-
-        @"limit": [PFPropertyAttributes attributes],
-        @"skip": [PFPropertyAttributes attributes],
-        @"cachePolicy": [PFPropertyAttributes attributes],
-        @"maxCacheAge": [PFPropertyAttributes attributes],
-
-        @"trace": [PFPropertyAttributes attributes],
-        @"shouldIgnoreACLs": [PFPropertyAttributes attributes],
-        @"shouldIncludeDeletingEventually": [PFPropertyAttributes attributes],
-        @"queriesLocalDatastore": [PFPropertyAttributes attributes],
-
-        @"localDatastorePinName": [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy]
+        PFQueryStatePropertyName(parseClassName): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+        PFQueryStatePropertyName(conditions): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+        PFQueryStatePropertyName(sortKeys): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+        PFQueryStatePropertyName(includedKeys): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+        PFQueryStatePropertyName(selectedKeys): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+        PFQueryStatePropertyName(extraOptions): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy],
+
+        PFQueryStatePropertyName(limit): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(skip): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(cachePolicy): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(maxCacheAge): [PFPropertyAttributes attributes],
+
+        PFQueryStatePropertyName(trace): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(shouldIgnoreACLs): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(shouldIncludeDeletingEventually): [PFPropertyAttributes attributes],
+        PFQueryStatePropertyName(queriesLocalDatastore): [PFPropertyAttributes attributes],
+
+        PFQueryStatePropertyName(localDatastorePinName): [PFPropertyAttributes attributesWithAssociationType:PFPropertyInfoAssociationTypeCopy]
     };
 }
 

Parse/Internal/Query/State/PFQueryState_Private.h

@@ -9,6 +9,17 @@
 
 #import "PFQueryState.h"
 
+#import "PFMacros.h"
+
+/**
+ Returns NSString representation of a property on PFQueryState.
+
+ @param NAME The name of the property.
+
+ @return NSString representaiton of a given property.
+ */
+#define PFQueryStatePropertyName(NAME) @keypath(PFQueryState, NAME)
+
 @interface PFQueryState () {
 @protected
     NSString *_parseClassName;