codegen: fix duplicate ID bug (#1891)

YaroShkvorets · web-flow · commit d1fa5e0e34a9 · 2025-01-07T19:43:20.000-05:00
fixes #1604 * fix codegen output class name duplicates * changeset
diff --git a/.changeset/blue-insects-visit.md b/.changeset/blue-insects-visit.md
@@ -0,0 +1,5 @@
+---
+'@graphprotocol/graph-cli': patch
+---
+
+fix bug with duplicate IDs - #1604
diff --git a/packages/cli/src/protocols/ethereum/codegen/abi.ts b/packages/cli/src/protocols/ethereum/codegen/abi.ts
@@ -358,7 +358,8 @@ export default class AbiCodeGenerator {
     }
 
     const tupleIdentifier = parentClass + tsCodegen.namedType(name).capitalize();
-    const tupleClassName = tupleIdentifier + 'Struct';
+    const tupleClassName =
+      tupleIdentifier + (parentField === 'outputValues' ? 'Output' : '') + 'Struct';
     let tupleClasses: any[] = [];
 
     const isTupleType = util.isTupleType(type);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@graphprotocol/graph-cli': patch
 +---
++
 +fix bug with duplicate IDs - #1604
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,8 @@ export default class AbiCodeGenerator {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`const tupleIdentifier = parentClass + tsCodegen.namedType(name).capitalize();`
`361`		`- const tupleClassName = tupleIdentifier + 'Struct';`
	`361`	`+ const tupleClassName =`
	`362`	`+ tupleIdentifier + (parentField === 'outputValues' ? 'Output' : '') + 'Struct';`
`362`	`363`	`let tupleClasses: any[] = [];`
`363`	`364`
`364`	`365`	`const isTupleType = util.isTupleType(type);`