fix: 👽️ due to null-safe changed

Author: huang12zheng

.github/publish.yaml

@@ -0,0 +1,20 @@
+on:
+  push:
+    tags:
+      - "*"
+
+name: Deploy Extension
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - name: Publish to Visual Studio Marketplace
+        uses: HaaLeo/publish-vscode-extension@v0
+        with:
+          pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
+          registryUrl: https://marketplace.visualstudio.com

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.5.3
+1. Add a config for `ignore_for_file`
+2. implement List<enum>
+3. do cast convert for fromMap
+4. add a ci template
+
 ## 0.5.2
 1. Due to the null-aware operator '?.' is unnecessary. replacing the operator '?.' with '.'
 2. add const to constructor if usesEquatable

package.json

@@ -3,7 +3,7 @@
 	"displayName": "Dart Data Class Generator",
 	"description": "Create dart data classes easily, fast and without writing boilerplate or running code generation.",
 	"publisher": "BendixMa",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"engines": {
 		"vscode": "^1.37.0"
 	},
@@ -92,6 +92,11 @@
 						"default": false,
 						"description": "If true, asks, when overriding a class (running the command on an existing class), for every single function/constructor that needs to be changed whether the generator should override the function or not. This allows you to preserve custom changes you made to the function/constructor that would be otherwise overwritten by the generator."
 					},
+					"dart_data_class_generator.ignoreComment.enabled": {
+						"type": "string",
+						"default": "",
+						"description": "Add a analyzer comment for file"
+					},
 					"dart_data_class_generator.json.seperate": {
 						"type": "string",
 						"enum": [

src/extension.js

@@ -1091,7 +1091,8 @@ class DataClassGenerator {
             method += `    '${p.jsonName}': `;
 
             if (p.isEnum) {
-                method += `${p.name}.index,\n`;
+                if (p.isCollection) method += `${p.name}.map((x) => x.index).toList(),\n`
+                else method += `${p.name}.index,\n`;
             } else if (p.isCollection) {
                 if (p.isMap || p.listType.isPrimitive) {
                     const mapFlag = p.isSet ? (p.isNullable ? '?' : '') + '.toList()' : '';
@@ -1123,32 +1124,52 @@ class DataClassGenerator {
          * @param {ClassField} prop
          */
         function customTypeMapping(prop, value = null) {
+            const materialConvertValue = prop.isCollection ? "" :" as int";
             prop = prop.isCollection ? prop.listType : prop;
-            const addDefault = withDefaultValues && prop.rawType != 'dynamic';
-            value = value == null ? `${leftOfValue}map['` + prop.jsonName + "']" : value;
+            const isAddDefault = withDefaultValues && prop.rawType != 'dynamic'&& !prop.isNullable &&  prop.isPrimitive;
+            const addLeftDefault = isAddDefault  ? leftOfValue : '';
+            const addRightDefault = isAddDefault ? rightOfValue : '';
+            value = value == null ? `${addLeftDefault}map['` + prop.jsonName + "']" : value;
 
             switch (prop.type) {
                 case 'DateTime':
-                    return `DateTime.fromMillisecondsSinceEpoch(${value})`;
+                    value=withDefaultValues ? `${leftOfValue}${value}??0${rightOfValue}` : value;
+                    return `DateTime.fromMillisecondsSinceEpoch(${value}${materialConvertValue})`;
                 case 'Color':
-                    return `Color(${value})`;
+                    value=withDefaultValues ? `${leftOfValue}${value}??0${rightOfValue}` : value;
+                    return `Color(${value}${materialConvertValue})`;
                 case 'IconData':
-                    return `IconData(${value}, fontFamily: 'MaterialIcons')`
+                    value=withDefaultValues ? `${leftOfValue}${value}??0${rightOfValue}` : value;
+                    return `IconData(${value}${materialConvertValue}, fontFamily: 'MaterialIcons')`
                 default:
-                    return `${!prop.isPrimitive ? prop.type + '.fromMap(' : ''}${value}${!prop.isPrimitive ? ')' : ''}${fromJSON ? (prop.isDouble ? '.toDouble()' : prop.isInt ? '.toInt()' : '') : ''}${addDefault && !prop.isNullable ? ` ?? ${prop.defValue}` : ''}`;
+                    return `${
+                      !prop.isPrimitive ? prop.type + ".fromMap(" : ""
+                    }${value}${!prop.isPrimitive ? " as Map<String,dynamic>)" : ""}${
+                      fromJSON
+                        ? prop.isDouble
+                          ? ".toDouble()"
+                          : prop.isInt
+                          ? ".toInt()"
+                          : ""
+                        : ""
+                    }${
+                        isAddDefault
+                        ? ` ?? ${prop.defValue}${addRightDefault}`
+                        : ""
+                    }`;
             }
         }
 
         let method = `factory ${clazz.name}.fromMap(Map<String, dynamic> map) {\n`;
         method += '  return ' + clazz.type + '(\n';
-        
+
         for (let p of props) {
             method += `    ${clazz.hasNamedConstructor ? `${p.name}: ` : ''}`;
 
-            const value = `${leftOfValue}map['${p.jsonName}']`;
+            const value = `map['${p.jsonName}']`;
+
+
 
-            
-            
 
             // Add nullable check before serialization
             if (p.isNullable) {
@@ -1157,27 +1178,44 @@ class DataClassGenerator {
 
             // serialization
             if (p.isEnum) {
-                const defaultValue = withDefaultValues ? ' ?? 0' : '';
-                method += `${p.rawType}.values[${value}${defaultValue}]`;
+                // List<E>
+                if (p.isCollection) {
+                    const defaultValue = withDefaultValues ? ' ?? <int>[]' : '';
+                    method += `${p.type}.from((${leftOfValue}${value}${defaultValue}${rightOfValue} as List<int>).map<${p.listType.rawType}>((x) => ${p.listType.rawType}.values[x]),)`
+                } else {
+                    const defaultValue = withDefaultValues ? ' ?? 0' : '';
+                    method += `${p.rawType}.values[${leftOfValue}${value}${defaultValue}${rightOfValue} as int]`;
+                }
+
             } else if (p.isCollection) {
-                const defaultValue = withDefaultValues && !p.isNullable ? ` ?? const ${p.isList ? '[]' : '{}'}` : '';
+                const defaultValue =
+                  withDefaultValues && !p.isNullable && p.isPrimitive
+                    ? ` ?? const <${p.listType.rawType}>${
+                        p.isList ? "[]" : "{}"
+                      })`
+                    : "";
 
                 method += `${p.type}.from(`;
+                /// List<String>.from(map['allowed'] ?? const <String>[] as List<String>), 
                 if (p.isPrimitive) {
-                    method += `${value}${defaultValue})`;
+                    method += `(${value}${defaultValue} as ${p.type})`;
                 } else {
-                    method += `${value}.map((x) => ${customTypeMapping(p, 'x')})${defaultValue})`;
+                    method += `(${value} as List<int>).map<${p.listType.rawType}>((x) => ${customTypeMapping(p, 'x')},),${defaultValue})`;
                 }
+            /// (map['name'] ?? '') as String
             } else {
-                method += customTypeMapping(p);
+                if (p.isPrimitive) 
+                    method += customTypeMapping(p)+` as ${p.type}`;
+                else
+                    method += customTypeMapping(p);
             }
 
             // end nullable check if field is nullable
             if (p.isNullable) {
                 method += " : null";
             }
 
-            method += `${rightOfValue} as ${p.type},\n`;
+            method += `,\n`;
 
             const isLast = p.name == props[props.length - 1].name;
             if (isLast) method += '  );\n';
@@ -2136,6 +2174,38 @@ function getReplaceEdit(values, imports = null, showLogs = false) {
     const uri = getDoc().uri;
 
     const noChanges = [];
+
+    let ignoreComment = readSetting("ignoreComment.enabled");
+    if (ignoreComment == '') ignoreComment = 'public_member_api_docs, sort_constructors_first';
+    const lines = [];
+    const ignores = [];
+
+    const text = getDocText();
+    text.split("\n").forEach(function (line) {
+      if (line.includes("// ignore_for_file:")) lines.push(line);
+    });
+    let isIncluding;
+    ignoreComment.split(",").forEach((ignore) => {
+      ignore.trim();
+
+      isIncluding = false;
+      lines.forEach((line) => {
+        if (line.includes(ignore)) {
+          isIncluding = true;
+        }
+      });
+      for (let line in lines) {
+      }
+      if (!isIncluding) ignores.push(ignore);
+    });
+    if (ignores.length > 0)
+      edit.insert(
+        uri,
+        new vscode.Position(0, 0),
+        `// ignore_for_file: ${ignores.join(",")}\n`
+      );
+
+
     for (var i = clazzes.length - 1; i >= 0; i--) {
         const clazz = clazzes[i];