Merge pull request #31 from iamarnas/master

Syntax correction

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Released]
 
+## [3.1.2] - 2021-04-23
+
+### Fixed
+
+- see [pull request](https://github.com/hiranthaR/Json-to-Dart-Model/pull/30) from [Arnas](https://github.com/iamarnas)
+   - Improved some syntax correction.
+
 ## [3.1.1] - 2021-04-17
 
 ### Added

README.md

@@ -63,6 +63,8 @@
 
 Given a JSON string, this library will generate all the necessary Dart classes to parse and generate JSON. Also designed to generate Flutter-friendly model classes following the [Flutter's doc recommendation](https://flutter.io/json/#serializing-json-manually-using-dartconvert) and [Effective Dart: Style](https://dart.dev/guides/language/effective-dart/style).  Extention supports for both **Serializing JSON manually** and **Serializing JSON** using code generation libraries like **Freezed** and **Json Serializable**. If you are an API service provider, you can build a `models.jsonc` file for your users to convert JSON to Dart language with a few clicks.
 
+> **Note:** When you use `Freezed` or `Json Serializable` then `Json to Dart Model` generates only types and everything that happens after, then `Json Serializable` takes care of the rest and is responsible for generated code.
+
 <!-- HOW IT WORKS -->
 ## How it Works
 

package.json

@@ -2,7 +2,7 @@
   "name": "json-to-dart",
   "displayName": "Json to Dart Model",
   "description": "Extension convert Json to Dart Model class",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "publisher": "hirantha",
   "icon": "icon.png",
   "engines": {

src/syntax.ts

@@ -111,22 +111,22 @@ const jsonParseClass = (key: string, typeDef: TypeDefinition, input: Input): str
           if (typeDef.isDate) {
             formatedValue += printLine(`.map((e) => ${parseDateTime("e")})`, true, tabs);
           } else {
-            formatedValue += printLine(`.map((e) => ${buildParseClass(key, jsonValue, true)})`, true, tabs);
+            formatedValue += printLine(`.map((e) => ${buildParseClass(key, "e")})`, true, tabs);
           }
         } else {
           if (typeDef.isDate) {
             formatedValue += printLine(`?.map((e) => ${parseDateTime("e")})`, true, tabs);
           } else {
-            formatedValue += printLine(`?.map((e) => ${buildParseClass(key, jsonValue, true)})`, true, tabs);
+            formatedValue += printLine(`?.map((e) => ${buildParseClass(key, "e")})`, true, tabs);
           }
         }
       } else {
         formatedValue += printLine(`?.map((e) => e == null`, true, 3 + 2 * result.length);
         formatedValue += printLine(`? null`, true, 5 + 2 * result.length);
         if (typeDef.isDate) {
-          formatedValue += printLine(`: ${parseDateTime(jsonValue)})`, true, 5 + 2 * result.length);
+          formatedValue += printLine(`: ${parseDateTime("e")})`, true, 5 + 2 * result.length);
         } else {
-          formatedValue += printLine(`: ${buildParseClass(key, jsonValue)})`, true, 5 + 2 * result.length);
+          formatedValue += printLine(`: ${buildParseClass(key, "e")})`, true, 5 + 2 * result.length);
         }
       }
       for (let i = 0; i < result.length - 1; i++) {
@@ -260,9 +260,9 @@ const buildToJsonClass = (expression: string, nullSafety: boolean = false): stri
     : `${expression}?.toJson()`;
 };
 
-const buildParseClass = (className: string, expression: string, nullSafety: boolean = false): string => {
+const buildParseClass = (className: string, expression: string): string => {
   const name = pascalCase(className).replace(/_/g, "");
-  return `${name}.fromJson(${nullSafety ? "e" : expression} as Map<String, dynamic>)`;
+  return `${name}.fromJson(${expression} as Map<String, dynamic>)`;
 };
 
 const parseDateTime = (expression: string): string => {