Merge pull request #666 from zapcannon87/develop

chore: tweak code

Author: zapcannon87

AVOS/Sources/Foundation/Query/LCQuery.h

@@ -109,12 +109,18 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)includeKey:(NSString *)key;
 
+/// Reset included keys.
+- (void)resetIncludeKey;
+
 /*!
  Make the query restrict the fields of the returned LCObjects to include only the provided keys.
  If this is called multiple times, then all of the keys specified in each of the calls will be included.
  @param keys The keys to include in the result.
  */
-- (void)selectKeys:(NSArray *)keys;
+- (void)selectKeys:(NSArray<NSString *> *)keys;
+
+/// Reset selected keys.
+- (void)resetSelectKey;
 
 /*!
  Add a constraint that requires a particular key exists.

AVOS/Sources/Foundation/Query/LCQuery.m

@@ -171,19 +171,25 @@ - (void)doInitialization {
     _maxCacheAge = 24 * 3600;
 }
 
-- (void)includeKey:(NSString *)key
-{
+- (void)includeKey:(NSString *)key {
     [self.include addObject:key];
 }
 
-- (void)selectKeys:(NSArray *)keys
-{
-    if (self.selectedKeys == nil) {
-        _selectedKeys = [[NSMutableSet alloc] initWithCapacity:keys.count];
+- (void)resetIncludeKey {
+    self.include = [[NSMutableSet alloc] init];
+}
+
+- (void)selectKeys:(NSArray<NSString *> *)keys {
+    if (!self.selectedKeys) {
+        self.selectedKeys = [[NSMutableSet alloc] initWithCapacity:keys.count];
     }
     [self.selectedKeys addObjectsFromArray:keys];
 }
 
+- (void)resetSelectKey {
+    self.selectedKeys = nil;
+}
+
 - (void)addWhereItem:(id)dict forKey:(NSString *)key {
     if ([dict objectForKey:@"$eq"]) {
         if ([self.where objectForKey:@"$and"]) {

AVOS/Sources/Foundation/Query/LCQuery_Internal.h

@@ -11,7 +11,7 @@
 @interface LCQuery ()
 @property (nonatomic, readwrite, strong) NSMutableDictionary *parameters;
 @property (nonatomic, readwrite, strong) NSMutableDictionary *where;
-@property (nonatomic, readwrite, strong) NSMutableSet * selectedKeys;
+@property (nonatomic) NSMutableSet<NSString *> *selectedKeys;
 @property (nonatomic, strong) NSMutableDictionary *extraParameters;
 
 - (NSDictionary *)assembleParameters;