增加对BOOL类型的支持

walkerwzy · Sep 18, 2017 · dd084c1 · dd084c1
1 parent b39eb5e
commit dd084c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app.js b/app.js
@@ -159,9 +159,8 @@ function assumeVarType(str, isArray, model) {
     let l_str = str.toLowerCase(), 
         model_type = str, // 类型 
         var_type = str;   // 字段
-    // if(l_str.includes('string')) model_type = "NSString *";
-    // 暂时把bool也算作字符串
-    if(['bool', 'boolean', 'string'].includes(l_str)) model_type = "NSString *";
+    if(l_str.includes('string')) model_type = "NSString *";
+    else if(['bool', 'boolean'].includes(l_str)) model_type = "BOOL";
     else if(['int', 'integer', 'long'].findIndex(v=>(new RegExp(v,'ig')).test(l_str)) >= 0) model_type = "NSInteger";
     else if(l_str == strlist) model_type = "NSArray<NSString *> *"
     else if(l_str == intlist) model_type = "NSArray<NSInteger> *";

diff --git a/templates/model/template.h b/templates/model/template.h
@@ -25,6 +25,12 @@ else if(prop.type == 'NSString *') return `
  */
 @property (nonatomic, copy) ${prop.type}${prop.name};
 `;
+else if(prop.type == 'BOOL') return `
+/**
+ * ${prop.des}
+ */
+@property (nonatomic, assign) ${prop.type} ${prop.name};
+`;
 return `
 /**
  * ${prop.des}