Own deep mutable copy implementation

podkovyrin · podkovyrin · commit feffda9c2ec1 · 2018-09-16T19:26:09.000+03:00
diff --git a/DSJSONSchemaValidation.podspec b/DSJSONSchemaValidation.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'DSJSONSchemaValidation'
-  s.version = '2.0.2'
+  s.version = '2.0.3'
   s.authors = {'Vlas Voloshin' => 'argentumko@gmail.com', 'Andrew Podkovyrin' => 'podkovyrin@gmail.com'}
   s.homepage = 'https://github.com/dashevo/JSONSchemaValidation'
   s.social_media_url = 'https://twitter.com/podkovyr'
diff --git a/DSJSONSchemaValidation/Categories/NSDictionary+DSJSONDeepMutableCopy.m b/DSJSONSchemaValidation/Categories/NSDictionary+DSJSONDeepMutableCopy.m
@@ -10,12 +10,47 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface NSArray (DSJSONDeepMutableCopyArray)
+
+- (NSMutableArray *)ds_deepMutableCopy;
+
+@end
+
+@implementation NSArray (DSJSONDeepMutableCopyArray)
+
+- (NSMutableArray *)ds_deepMutableCopy {
+    NSMutableArray *mutableSelf = [NSMutableArray arrayWithCapacity:self.count];
+    for (id object in self) {
+        if ([object isKindOfClass:NSArray.class] || [object isKindOfClass:NSDictionary.class]) {
+            [mutableSelf addObject:[(NSArray *)object ds_deepMutableCopy]];
+        }
+        else {
+            [mutableSelf addObject:object];
+        }
+    }
+    return mutableSelf;
+}
+
+@end
+
 @implementation NSDictionary (DSJSONDeepMutableCopy)
 
-- (NSMutableDictionary *)ds_deepMutableCopy
-{
-    NSMutableDictionary *mutableCopy = (NSMutableDictionary *)CFBridgingRelease(CFPropertyListCreateDeepCopy(kCFAllocatorDefault, (CFDictionaryRef)self, kCFPropertyListMutableContainers));
-    return mutableCopy;
+- (NSMutableDictionary *)ds_deepMutableCopy {
+    NSMutableDictionary *mutableSelf = [NSMutableDictionary dictionaryWithCapacity:self.count];
+    for (id key in self) {
+        id mutableKey = key;
+        if ([key isKindOfClass:NSArray.class] || [key isKindOfClass:NSDictionary.class]) {
+            mutableKey = [(NSDictionary *)key ds_deepMutableCopy];
+        }
+        
+        id mutableValue = self[key];
+        if ([mutableValue isKindOfClass:NSArray.class] || [mutableValue isKindOfClass:NSDictionary.class]) {
+            mutableValue = [(NSDictionary *)mutableValue ds_deepMutableCopy];
+        }
+        
+        mutableSelf[mutableKey] = mutableValue;
+    }
+    return mutableSelf;
 }
 
 @end
