feat: 增加二维数组的支持，修复bug

Author: fastcode555

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
           tag_name: v${{ env.version_name }}
           release_name: v${{ env.version_name }}
           body: |
-            Release notes and changelog go here.
+            加上对二维数组的解析，只增加了dart部分.
 
       - name: Upload Release Asset
         id: upload-release-asset

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'org.example'
-version '1.7.7-SNAPSHOT'
+version '1.7.8-SNAPSHOT'
 
 
 repositories {
@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
-    implementation "com.alibaba:fastjson:1.2.73"
+    implementation "com.alibaba:fastjson:1.2.83"
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
 }
 

publish_version/JsonBeanGenerator-1.7.6-SNAPSHOT.zip

@@ -60,7 +60,7 @@ class DartJsonGenerator(
                 builder.append("\t${key.toUpperCamel()}? ${key.toCamel()};\n")
                 construtorMethod.append("this.${key.toCamel()},")
                 toJsonMethod.append("\t\t\t'$key':${key.toCamel()}?.toJson(),\n")
-                fromJsonMethod.append("\t\t${key.toCamel()} = json.asBean('$key', ${key.toUpperCamel()}.fromJson);\n")
+                fromJsonMethod.append("\t\t${key.toCamel()} = json.asBean('$key', (v) => ${key.toUpperCamel()}.fromJson(v));\n")
                 cloneMethod.append("        ${key.toCamel()}: ${key.toCamel()}?.clone(),\n")
                 classes.add(parseJson(element, key.toUpperCamel(), classes))
             } else if (element is JSONArray) {
@@ -72,18 +72,41 @@ class DartJsonGenerator(
                         toJsonMethod.append("\t\t\t'$key':${key.toCamel()},\n")
                         fromJsonMethod.append("\t\t${key.toCamel()} = json.asList<${getType(result)}>('$key');\n")
                         cloneMethod.append("        ${key.toCamel()}: List<${getType(result)}>.from(${key.toCamel()}??[]),\n")
+                    } else if (result is JSONArray) {
+                        //二维数组类型
+                        val item = result[0]
+                        if (item is String || item is Int || item is Double || item is Boolean || item is Float) {
+                            val listType = "${getType(item)}"
+                            builder.append("\tList<List<${listType}>>? ${key.toCamel()};\n")
+                            toJsonMethod.append("\t\t\t'$key':${key.toCamel()},\n")
+                            fromJsonMethod.append("\t\t${key.toCamel()} = json.asArray2d<${listType}>('$key');\n")
+                            cloneMethod.append(
+                                "        ${key.toCamel()}: ${key.toCamel()}?.map((e) => List<${
+                                    getType(
+                                        item
+                                    )
+                                }>.from(e)).toList(),\n"
+                            )
+                        } else {
+                            val listType = "${key.toUpperCamel()}"
+                            builder.append("\tList<List<$listType>>? ${key.toCamel()};\n")
+                            toJsonMethod.append("\t\t\t'$key':${key.toCamel()}?.map((v) => v.map((e) => e.toJson()).toList()).toList(),\n")
+                            fromJsonMethod.append("\t\t${key.toCamel()} = json.asArray2d<${listType}>('$key', (v) => ${key.toUpperCamel()}.fromJson(v));\n")
+                            classes.add(parseJson(item, key.toUpperCamel(), classes))
+                            cloneMethod.append("        ${key.toCamel()}: ${key.toCamel()}?.map((v) => v.map((e) => e.clone()).toList()).toList(),\n")
+                        }
                     } else {//对象类型
                         builder.append("\tList<${key.toUpperCamel()}>? ${key.toCamel()};\n")
                         toJsonMethod.append("\t\t\t'$key':${key.toCamel()}?.map((v)=>v.toJson()).toList(),\n")
-                        fromJsonMethod.append("\t\t${key.toCamel()} = json.asList<${key.toUpperCamel()}>('$key', ${key.toUpperCamel()}.fromJson);\n")
+                        fromJsonMethod.append("\t\t${key.toCamel()} = json.asList<${key.toUpperCamel()}>('$key', (v) => ${key.toUpperCamel()}.fromJson(v));\n")
                         classes.add(parseJson(result, key.toUpperCamel(), classes))
                         cloneMethod.append("        ${key.toCamel()}: ${key.toCamel()}?.map((v) => v.clone()).toList(),\n")
                     }
                 } else {//不明类型
                     construtorMethod.append("this.${key.toCamel()},")
                     builder.append("\tList<${key.toUpperCamel()}>? ${key.toCamel()};\n")
                     toJsonMethod.append("\t\t\t'$key':${key.toCamel()}?.map((v)=>v.toJson()).toList(),\n")
-                    fromJsonMethod.append("\t\t${key.toCamel()} = json.asList<${key.toUpperCamel()}>('$key', ${key.toUpperCamel()}.fromJson);\n")
+                    fromJsonMethod.append("\t\t${key.toCamel()} = json.asList<${key.toUpperCamel()}>('$key', (v) => ${key.toUpperCamel()}.fromJson(v));\n")
                     classes.add(parseJson(JSONObject(), key.toUpperCamel(), classes))
                     cloneMethod.append("        ${key.toCamel()}: ${key.toCamel()}?.map((v) => v.clone()).toList(),\n")
                 }
@@ -199,22 +222,18 @@ class DartJsonGenerator(
     }
 
     private fun getParseType(element: Any): String {
-        return when (element) {
-            (element is String) -> "asString"
-            (element is Int) -> "asInt"
-            (element is Double || element is Float) -> "asDouble"
-            (element is Boolean) -> "asBool"
-            else -> "asString"
-        }
+        if (element is String) return "asString"
+        if (element is Int) return "asInt"
+        if (element is Double || element is Float) return "asDouble"
+        if (element is Boolean) return "asBool"
+        return "String"
     }
 
     private fun getType(element: Any): String {
-        return when (element) {
-            (element is String) -> "String"
-            (element is Int) -> "int"
-            (element is Double || element is Float) -> "double"
-            (element is Boolean) -> "bool"
-            else -> "String"
-        }
+        if (element is String) return "String"
+        if (element is Int) return "int"
+        if (element is Double || element is Float) return "double"
+        if (element is Boolean) return "bool"
+        return "String"
     }
 }

publish_version/JsonBeanGenerator-1.7.7-SNAPSHOT.zip

@@ -87,11 +87,9 @@ class TsJsonGenerator(
     }
 
     private fun getType(element: Any): String {
-        return when (element) {
-            (element is String) -> "string"
-            (element is Int || element is Double || element is Float) -> "number"
-            (element is Boolean) -> "boolean"
-            else -> "string"
-        }
+        if (element is String) return "string"
+        if (element is Int || element is Double || element is Float) return "number"
+        if (element is Boolean) return "boolean"
+        return "string"
     }
 }

src/main/kotlin/com/awesome/plugins/json2bean/generators/DartJsonGenerator.kt

@@ -124,13 +124,11 @@ class KtFastJsonGenerator(
     }
 
     private fun getType(element: Any): String {
-        return when (element) {
-            (element is String) -> "String"
-            (element is Int) -> "Int"
-            (element is Double || element is BigDecimal) -> "Double"
-            (element is Float) -> "Float"
-            (element is Boolean) -> "Boolean"
-            else -> "String"
-        }
+        if (element is String) return "String"
+        if (element is Int) return "Int"
+        if (element is Double || element is BigDecimal) return "Double"
+        if (element is Float) return "Float"
+        if (element is Boolean) return "Boolean"
+        return "String"
     }
 }

src/main/kotlin/com/awesome/plugins/json2bean/generators/TsJsonGenerator.kt

@@ -124,13 +124,11 @@ class KtGsonGenerator(
     }
 
     private fun getType(element: Any): String {
-        return when (element) {
-            (element is String) -> "String"
-            (element is Int) -> "Int"
-            (element is Double || element is BigDecimal) -> "Double"
-            (element is Float) -> "Float"
-            (element is Boolean) -> "Boolean"
-            else -> "String"
-        }
+        if (element is String) return "String"
+        if (element is Int) return "Int"
+        if (element is Double || element is BigDecimal) return "Double"
+        if (element is Float) return "Float"
+        if (element is Boolean) return "Boolean"
+        return "String"
     }
 }

src/main/kotlin/com/awesome/plugins/json2bean/generators/ktgenerators/KtFastJsonGenerator.kt

@@ -108,13 +108,11 @@ class MapKtJsonGenerator(
     }
 
     private fun getType(element: Any): String {
-        return when (element) {
-            (element is String) -> "String"
-            (element is Int) -> "Int"
-            (element is Double || element is BigDecimal) -> "Double"
-            (element is Float) -> "Float"
-            (element is Boolean) -> "Boolean"
-            else -> "String"
-        }
+        if (element is String) return "String"
+        if (element is Int) return "Int"
+        if (element is Double || element is BigDecimal) return "Double"
+        if (element is Float) return "Float"
+        if (element is Boolean) return "Boolean"
+        return "String"
     }
 }