Merge pull request #10 from jsonmaster/development

Development

Author: mukeshydv

index.html

@@ -93,6 +93,8 @@
 						<label for="input">Input JSON:</label>
 						<textarea class="form-control form-font" rows="25" id="input"></textarea>
 					</div> 
+					<div class="alert alert-danger" id="errorAlert" role="alert">
+					</div>
 				</div>
 				<div class="col-sm-5" id="output">
 				</div>

script/parser.js

@@ -24,26 +24,20 @@ FileBuilder.prototype = {
 	constructor: FileBuilder,
 	classes: function(string) {
 
-		let json = JSON.parse(string);
+		try {
+			let json = JSON.parse(string);
 
-		if (json) {
-			var className = this.rootClassName;
-			if (!className) {
-				className = "Sample";
-			}
-
-			let files = this.getFiles(className, json, this.language);
-
-
-			// var result = "";
-
-			// files.forEach(function(file) {
-			// 	let fileString = file.toString();
-			// 	result += fileString;
-			// 	result += "\n\n";
-			// });
+			if (json) {
+				var className = this.rootClassName;
+				if (!className) {
+					className = "Sample";
+				}
 
-			return files;
+				let files = this.getFiles(className, json, this.language);
+				return files;
+			}
+		} catch (e) {
+			throw e;
 		}
 
 		return new Array();
@@ -73,10 +67,10 @@ FileBuilder.prototype.getFiles = function(fileName, object, language) {
 		if (prevIndex < 0) {
 			if (property.isCustomClass) {
 				let file = _this.getFiles(property.propertyType, value, language);
-				files = file;
+				files = files.concat(file);
 			} else if (property.isArray && property.elementTypeIsCustom) {
 				let file = _this.getFiles(property.elementType, value, language);
-				files = file;
+				files = files.concat(file);
 			}
 
 			properties.push(property);

script/script.js

@@ -93,8 +93,14 @@ function inputChanged() {
 }
 
 function buildClasses(language) {
-  let result = getAllClasses(language);
-  showResult(result);
+  try {
+    let result = getAllClasses(language);
+    showResult(result);
+    $('#errorAlert').hide();
+  } catch (e) {
+    $('#errorAlert').text(e.message.replaceAll("JSON.parse: ",""));
+    $('#errorAlert').show();
+  }
 }
 
 function getAllClasses(language) {
@@ -115,7 +121,11 @@ function getAllClasses(language) {
 
   builder.methods = methods;
 
-  return builder.classes(input);
+  try {
+    return builder.classes(input);
+  } catch (e) {
+    throw e;
+  }
 }
 
 function showResult(classes) {