fix naming of deep-nested duplicate objects

Author: grische

json-to-go.js

@@ -20,6 +20,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 	let innerTabs = 0;
 	let parent = "";
 	let globallySeenTypeNames = [];
+	let previousParents = "";
 
 	try
 	{
@@ -129,7 +130,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 						struct[keyname] = elem.value;
 						omitempty[keyname] = elem.count != scopeLength;
 					}
-					parseStruct(depth + 1, innerTabs, struct, omitempty); // finally parse the struct !!
+					parseStruct(depth + 1, innerTabs, struct, omitempty, previousParents); // finally parse the struct !!
 				}
 				else if (sliceType == "slice") {
 					parseScope(scope[0], depth)
@@ -152,7 +153,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 						append(parent)
 					}
 				}
-				parseStruct(depth + 1, innerTabs, scope);
+				parseStruct(depth + 1, innerTabs, scope, false, previousParents);
 			}
 		}
 		else {
@@ -165,7 +166,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 		}
 	}
 
-	function parseStruct(depth, innerTabs, scope, omitempty)
+	function parseStruct(depth, innerTabs, scope, omitempty, oldParents)
 	{
 		if (flatten) {
 			stack.push(
@@ -194,14 +195,15 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 			appender(`${parentType} struct {\n`);
 			++innerTabs;
 			const keys = Object.keys(scope);
+			previousParents = parent
 			for (let i in keys)
 			{
 				const keyname = getOriginalName(keys[i]);
 				indenter(innerTabs)
 				let typename
 				// structs will be defined on the top level of the go file, so they need to be globally unique
 				if (typeof scope[keys[i]] === "object" && scope[keys[i]] !== null) {
-					typename = uniqueTypeName(format(keyname), globallySeenTypeNames, parent)
+					typename = uniqueTypeName(format(keyname), globallySeenTypeNames, previousParents)
 					globallySeenTypeNames.push(typename)
 				} else {
 					typename = uniqueTypeName(format(keyname), seenTypeNames)
@@ -220,20 +222,22 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 			}
 			indenter(--innerTabs);
 			appender("}");
+			previousParents = oldParents;
 		}
 		else
 		{
 			append("struct {\n");
 			++tabs;
 			const keys = Object.keys(scope);
+			previousParents = parent
 			for (let i in keys)
 			{
 				const keyname = getOriginalName(keys[i]);
 				indent(tabs);
 				let typename
 				// structs will be defined on the top level of the go file, so they need to be globally unique
 				if (typeof scope[keys[i]] === "object" && scope[keys[i]] !== null) {
-					typename = uniqueTypeName(format(keyname), globallySeenTypeNames, parent)
+					typename = uniqueTypeName(format(keyname), globallySeenTypeNames, previousParents)
 					globallySeenTypeNames.push(typename)
 				} else {
 					typename = uniqueTypeName(format(keyname), seenTypeNames)
@@ -256,6 +260,7 @@ function jsonToGo(json, typename, flatten = true, example = false, allOmitempty
 			}
 			indent(--tabs);
 			append("}");
+			previousParents = oldParents;
 		}
 		if (flatten)
 			accumulator += stack.pop();

json-to-go.test.js

@@ -158,6 +158,7 @@ function testFiles() {
 
   const testCases = [
     "duplicate-top-level-structs",
+    "double-nested-objects",
   ];
 
   for (const testCase of testCases) {

tests/double-nested-objects.go

@@ -0,0 +1,19 @@
+type AutoGenerated struct {
+	First First `json:"first"`
+	Second Second `json:"second"`
+}
+type Type struct {
+	Short string `json:"short"`
+	Long string `json:"long"`
+}
+type First struct {
+	ID int `json:"id"`
+	Type Type `json:"type"`
+}
+type SecondType struct {
+	Long string `json:"long"`
+}
+type Second struct {
+	ID int `json:"id"`
+	SecondType SecondType `json:"type"`
+}

tests/double-nested-objects.json

@@ -0,0 +1,15 @@
+{
+    "first": {
+        "id": 1,
+        "type": {
+            "short": "owa",
+            "long": "objectwitharray"
+        }
+    },
+    "second": {
+        "id": 2,
+        "type": {
+            "long": "object"
+        }
+    }
+}