Skip to content

Commit c5bc916

Browse files
authored
Remove Anchor V01 Accounts from Defined Types (#37)
1 parent 238f484 commit c5bc916

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.changeset/hip-years-clean.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@kinobi-so/nodes-from-anchor": patch
3+
---
4+
5+
Remove Anchor V01 accounts from defined types to resolve duplicate exports in generated clients

packages/nodes-from-anchor/src/v01/ProgramNode.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ export function programNodeFromAnchorV01(idl: IdlV01): ProgramNode {
1313
const instructions = idl.instructions ?? [];
1414
const errors = idl.errors ?? [];
1515

16-
const definedTypes = types.map(definedTypeNodeFromAnchorV01);
16+
const filteredTypes = types.filter(type => !accounts.some(account => account.name === type.name));
17+
const definedTypes = filteredTypes.map(definedTypeNodeFromAnchorV01);
1718
const accountNodeFromAnchorV01 = accountNodeFromAnchorV01WithTypeDefinition(types);
1819
const pdas = instructions
1920
.flatMap<IdlV01InstructionAccount>(instruction => instruction.accounts)
2021
.filter(account => !!account.pda && !account.pda?.program)
2122
.map(pdaNodeFromAnchorV01);
22-
2323
return programNode({
2424
accounts: accounts.map(accountNodeFromAnchorV01),
2525
definedTypes,

packages/nodes-from-anchor/test/v01/ProgramNode.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {
22
accountNode,
33
bytesTypeNode,
44
constantPdaSeedNode,
5-
definedTypeNode,
65
errorNode,
76
fieldDiscriminatorNode,
87
fixedSizeTypeNode,
@@ -66,7 +65,7 @@ test('it creates program nodes', () => {
6665
name: 'myAccount',
6766
}),
6867
],
69-
definedTypes: [definedTypeNode({ name: 'myAccount', type: structTypeNode([]) })],
68+
definedTypes: [],
7069
errors: [
7170
errorNode({
7271
code: 42,

0 commit comments

Comments
 (0)