fix bug

Author: indulgeIn

YBModelFile/Handler/YBMFCodeForParentHandler.m

@@ -30,15 +30,15 @@ - (NSString *)ybmf_codeForParentWithNode:(YBMFNode *)node {
         case YBMFNodeTypeClass:
             return [NSString stringWithFormat:@"@property (nonatomic, strong) %@ *", node.className];
         case YBMFNodeTypeNSMutableArray: {
-            YBMFNode *child = node.children[[YBMFConfig shareConfig].containerElementName];
+            YBMFNode *child = node.children[YBMFNodeArrayElementKey];
             if (child && child.className && child.className.length > 0) {
                 return [NSString stringWithFormat:@"@property (nonatomic, strong) NSMutableArray<%@ *> *", child.className];
             } else {
                 return @"@property (nonatomic, strong) NSMutableArray *";
             }
         }
         case YBMFNodeTypeNSArray: {
-            YBMFNode *child = node.children[[YBMFConfig shareConfig].containerElementName];
+            YBMFNode *child = node.children[YBMFNodeArrayElementKey];
             if (child && child.className && child.className.length > 0) {
                 return [NSString stringWithFormat:@"@property (nonatomic, copy) NSArray<%@ *> *", child.className];
             } else {

YBModelFile/Handler/YBMFFileHHandler.m

@@ -50,7 +50,7 @@ - (NSString *)ybmf_importInfoWithNode:(YBMFNode *)node withoutProperty:(BOOL)wit
     [node.children enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, YBMFNode * _Nonnull obj, BOOL * _Nonnull stop) {
         NSString *customClassName;
         if (obj.type == YBMFNodeTypeNSArray) {
-            YBMFNode *child = obj.children[[YBMFConfig shareConfig].containerElementName];
+            YBMFNode *child = obj.children[YBMFNodeArrayElementKey];
             if (child && child.type == YBMFNodeTypeClass) {
                 customClassName = child.className;
             }

YBModelFile/Node/YBMFNode.h

@@ -10,6 +10,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString * const YBMFNodeArrayElementKey;
+
 typedef NS_ENUM(NSInteger, YBMFNodeType) {
     YBMFNodeTypeUnknown,
     YBMFNodeTypeNSString,

YBModelFile/Node/YBMFNode.m

@@ -9,6 +9,8 @@
 #import "YBMFNode.h"
 #import "YBMFConfig.h"
 
+NSString * const YBMFNodeArrayElementKey = @"kYBMFNodeArrayElementName";
+
 @implementation YBMFNode
 
 #pragma mark - setter

YBModelFile/YBMFConfig.h

@@ -63,9 +63,6 @@ typedef NS_ENUM(NSInteger, YBMFFilePartitionMode) {
 /** 是否需要实现 NSCoding 协议 (默认为 YES) */
 @property (nonatomic, assign) BOOL needCoding;
 
-/** 容器元素的类拓展名 (默认为 Ele) */
-@property (nonatomic, strong) NSString *containerElementName;
-
 /** 数据模型类的统一基类 (默认为 NSObject) */
 @property (nonatomic, strong) Class baseClass;
 

YBModelFile/YBMFConfig.m

@@ -33,7 +33,6 @@ - (instancetype)initDefaults {
         self.framework = YBMFFrameworkYY;
         self.needCopying = YES;
         self.needCoding = YES;
-        self.containerElementName = @"Ele";
         self.nameHander = YBMFNameHandler.new;
         self.fileNoteHander = YBMFFileNoteHandler.new;
         self.fileHHandler = YBMFFileHHandler.new;

YBModelFile/YBModelFile.m

@@ -24,7 +24,7 @@ + (void)createFileWithName:(NSString *)name data:(id)data {
 
 + (void)createFileWithName:(NSString *)name data:(id)data path:(nullable NSString *)path {
 #if DEBUG
-    if (TARGET_OS_IPHONE) {
+    if (!TARGET_IPHONE_SIMULATOR) {
         NSAssert(0, @"请用模拟器运行");
     }
     [self _createFileWithName:name data:data path:path];
@@ -89,7 +89,7 @@ - (YBMFNode *)buildTreeWithParentClassName:(NSString *)parentClassName key:(id)k
 
             YBMFNode *child = [self buildTreeWithParentClassName:node.className key:_key value:_value];
             if (child.type == YBMFNodeTypeNSArray) {
-                YBMFNode *ele = child.children[[YBMFConfig shareConfig].containerElementName];
+                YBMFNode *ele = child.children[YBMFNodeArrayElementKey];
                 //添加容器元素映射
                 if (ele && ele.type == YBMFNodeTypeClass) {
                     node.containerMapper[n_key] = ele.className;
@@ -107,9 +107,8 @@ - (YBMFNode *)buildTreeWithParentClassName:(NSString *)parentClassName key:(id)k
         }
 
         if (((NSArray *)value).count > 0) {
-            NSString *expectName = [[YBMFConfig shareConfig].nameHander ybmf_classNameWithPrefix:parentClassName suffix:[YBMFConfig shareConfig].fileSuffix key:key];
-            YBMFNode *child = [self buildTreeWithParentClassName:expectName key:[YBMFConfig shareConfig].containerElementName value:((NSArray *)value).firstObject];
-            node.children[[YBMFConfig shareConfig].containerElementName] = child;
+            YBMFNode *child = [self buildTreeWithParentClassName:parentClassName key:key value:((NSArray *)value).firstObject];
+            node.children[YBMFNodeArrayElementKey] = child;
         }
 
     } else if ([value isKindOfClass:NSString.class]) {
@@ -232,7 +231,7 @@ - (void)dfs_creatFilesWithDirectoryPath:(NSString *)path node:(YBMFNode *)node {
         if (obj.type == YBMFNodeTypeClass) {
             [self dfs_creatFilesWithDirectoryPath:path node:obj];
         } else if (obj.type == YBMFNodeTypeNSArray || obj.type == YBMFNodeTypeNSMutableArray) {
-            YBMFNode *child = obj.children[[YBMFConfig shareConfig].containerElementName];
+            YBMFNode *child = obj.children[YBMFNodeArrayElementKey];
             if (child && child.type == YBMFNodeTypeClass) {
                 [self dfs_creatFilesWithDirectoryPath:path node:child];
             }
@@ -247,7 +246,7 @@ - (void)dfs_mergeWithCodeInFileH:(NSMutableString *)codeInFileH codeInFileM:(NSM
         if (obj.type == YBMFNodeTypeClass) {
             [self dfs_mergeWithCodeInFileH:codeInFileH codeInFileM:codeInFileM node:obj];
         } else if (obj.type == YBMFNodeTypeNSArray || obj.type == YBMFNodeTypeNSMutableArray) {
-            YBMFNode *child = obj.children[[YBMFConfig shareConfig].containerElementName];
+            YBMFNode *child = obj.children[YBMFNodeArrayElementKey];
             if (child && child.type == YBMFNodeTypeClass) {
                 [self dfs_mergeWithCodeInFileH:codeInFileH codeInFileM:codeInFileM node:child];
             }