Merge pull request #13 from mukeshydv/development

Development

Author: mukeshydv

README.md

@@ -11,6 +11,8 @@ Visit: https://jsonmaster.github.io
 2. **Java**
     - [Gson](https://github.com/google/gson)
     - [Android/JSONObject](https://developer.android.com/reference/org/json/JSONObject)
-3. **C#**
+3. **Kotlin**
+    - [Gson](https://github.com/google/gson)
+4. **C#**
     - [Newtonsoft](https://www.newtonsoft.com/json/help/html/SerializingJSON.htm)
     - C# Class

languages/KotlinGson.json

@@ -0,0 +1,124 @@
+{
+    "modelStart": "",
+    "reservedKeywords": [
+        "field",
+        "dynamic",
+        "delegate",
+        "constructor",
+        "by",
+        "when",
+        "var",
+        "val",
+        "typealias",
+        "object",
+        "is",
+        "in",
+        "fun",
+        "as",
+        "abstract",
+        "continue",
+        "for",
+        "new",
+        "null",
+        "switch",
+        "assert",
+        "default",
+        "if",
+        "package",
+        "synchronized",
+        "boolean",
+        "do",
+        "goto",
+        "private",
+        "this",
+        "break",
+        "double",
+        "implements",
+        "protected",
+        "throw",
+        "byte",
+        "else",
+        "import",
+        "public",
+        "throws",
+        "case",
+        "enum",
+        "instanceof",
+        "return",
+        "transient",
+        "catch",
+        "extends",
+        "int",
+        "short",
+        "try",
+        "char",
+        "final",
+        "interface",
+        "static",
+        "void",
+        "class",
+        "finally",
+        "long",
+        "strictfp",
+        "volatile",
+        "const",
+        "float",
+        "native",
+        "super",
+        "while",
+        "file",
+        "get",
+        "init",
+        "param",
+        "property",
+        "receiver",
+        "set",
+        "setparam",
+        "where",
+        "actual",
+        "annotation",
+        "companion",
+        "const",
+        "crossinline",
+        "data",
+        "enum",
+        "expect",
+        "external",
+        "infix",
+        "inline",
+        "inner",
+        "internal",
+        "lateinit",
+        "noinline",
+        "open",
+        "operator",
+        "out",
+        "reified",
+        "sealed",
+        "suspend",
+        "tailrec",
+        "vararg",
+        "it"
+    ],
+
+    "dataTypes": {
+        "arrayType": "List<<!ElementType!>>",
+        "generic": "Any",
+        "string": "String",
+        "boolean": "Boolean",
+        "float": "Double",
+        "doubleType": "Double",
+        "characterType": "Int",
+        "longType": "Long",
+        "int": "Int"
+    },
+
+    "modelDefinition": "\ndata class <!ModelName!> (<!ModelDefinitionProperty!>\n) ",
+    "fileExtension": "kt",
+    "codeForEachProperty": "\n\t\t@SerializedName(\"<!JsonKeyName!>\") val <!VarName!>: <!VarType!>",
+    "modelEnd": "",
+    "staticImports": "\nimport com.google.gson.annotations.SerializedName",
+    "supportsCamelcasing": true,
+    "methods": {
+    }
+}

script/parser.js

@@ -12,6 +12,7 @@ let jsonKeyName = "<!JsonKeyName!>"
 let constKeyName = "<!ConstKeyName!>"
 let additionalCustomTypeProperty = "<!AdditionalForCustomTypeProperty!>"
 let modelIdentifier = "<!ModelIdentifier!>"
+let modelDefinitionProperties = "<!ModelDefinitionProperty!>"
 
 
 // FileBuilder
@@ -255,13 +256,17 @@ FileRepresenter.prototype = {
 	},
 
 	addProperties: function() {
-		var propertyString = "\n";
 
-		this.properties.forEach(function(property) {
-			propertyString += property.toString();
-		});
+		if (this.language.instanceVarDefinition) {
+			var propertyString = "\n";
+
+			this.properties.forEach(function(property) {
+				propertyString += property.toString();
+			});
 
-		return propertyString;
+			return propertyString;
+		}
+		return "";
 	},
 
 	addSetterGetter: function() {
@@ -375,15 +380,31 @@ FileRepresenter.prototype = {
 		return content;
 	},
 
+	addModelDefinition: function() {
+
+		var modelDefinition = this.language.modelDefinition.replaceAll(modelName, this.className).replaceAll(modelIdentifier, this.modelIdentifier);
+		
+
+		if (this.language.codeForEachProperty) {
+			var _language = this.language;
+			let propertyList = this.properties.map(function (property) { 
+				return _language.codeForEachProperty.replaceAll(varName, property.propertyName).replaceAll(jsonKeyName, property.jsonKeyName).replaceAll(varType, property.propertyType);
+			}).join(",");
+
+			modelDefinition = modelDefinition.replaceAll(modelDefinitionProperties, propertyList);
+		}
+
+		return modelDefinition;
+	},
+
 	toString: function() {
 		var content = "";
 
 		content = content + this.addFirstLine();
 		content = content + this.addCopyright();
 		content = content + this.addImports();
 
-		let modelDefinition = this.language.modelDefinition.replaceAll(modelName, this.className).replaceAll(modelIdentifier, this.modelIdentifier);
-		content = content + modelDefinition;
+		content = content + this.addModelDefinition();
 		content = content + this.language.modelStart;
 
 		content = content + this.addProperties();

script/script.js

@@ -61,6 +61,16 @@ let languages = {
       }
     }
   },
+  kotlin: {
+    name: "Kotlin",
+    frameworks: {
+      gson: {
+        mode: "text/x-java",
+        name: "Gson",
+        file: "KotlinGson.json"
+      }
+    }
+  },
   csharo: {
     name: "C#",
     frameworks: {