⬆️ Update json-to-go

refs: mholt/json-to-go#120
nkmr-jp · Oct 28, 2022 · 4c0cf8a · 4c0cf8a
1 parent 2af03f3
commit 4c0cf8a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/vendor/json-to-go.js b/vendor/json-to-go.js
@@ -22,7 +22,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 
 	try
 	{
-		data = JSON.parse(json.replace(/:(\s*\d*)\.0/g, ":$1.1")); // hack that forces floats to stay as floats
+		data = JSON.parse(json.replace(/(:\s*\[?\s*-?\d*)\.0/g, "$1.1")); // hack that forces floats to stay as floats
 		scope = data;
 	}
 	catch (e)
@@ -62,7 +62,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 					else if (sliceType != thisType)
 					{
 						sliceType = mostSpecificPossibleGoType(thisType, sliceType);
-						if (sliceType == "interface{}")
+						if (sliceType == "any")
 							break;
 					}
 				}
@@ -130,9 +130,9 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 				}
 				else {
 					if (flatten && depth >= 2) {
-						appender(sliceType || "interface{}");
+						appender(sliceType || "any");
 					} else {
-						append(sliceType || "interface{}");
+						append(sliceType || "any");
 					}
 				}
 			}
@@ -316,7 +316,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 	function goType(val)
 	{
 		if (val === null)
-			return "interface{}";
+			return "any";
 
 		switch (typeof val)
 		{
@@ -342,7 +342,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 					return "slice";
 				return "struct";
 			default:
-				return "interface{}";
+				return "any";
 		}
 	}
 
@@ -356,7 +356,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 				&& typ2.substr(0, 5) == "float")
 			return typ2;
 		else
-			return "interface{}";
+			return "any";
 	}
 
 	// Proper cases a string according to Go conventions