Filter out type variant on imports (#53)

* Add missing type prefix

* Add changeset

* Fix lint

* Revert prefix

* Filter out type variant on imports

* Update changeset description

Author: febo

.changeset/shy-points-march.md

@@ -0,0 +1,5 @@
+---
+'@kinobi-so/renderers-js': patch
+---
+
+Filter out type variant on imports

packages/renderers-js/src/ImportMap.ts

@@ -135,7 +135,18 @@ export class ImportMap {
                 return a.localeCompare(b);
             })
             .map(([module, imports]) => {
-                const joinedImports = [...imports].sort().join(', ');
+                const joinedImports = [...imports]
+                    .sort()
+                    .filter(i => {
+                        // import of a type can either be '<Type>' or 'type <Type>', so
+                        // we filter out 'type <Type>' variation if there is a '<Type>'
+                        const name = i.split(' ');
+                        if (name.length > 1) {
+                            return !imports.has(name[1]);
+                        }
+                        return true;
+                    })
+                    .join(', ');
                 return `import { ${joinedImports} } from '${module}';`;
             })
             .join('\n');

packages/renderers-js/test/accountsPage.test.ts

@@ -1,4 +1,19 @@
-import { accountNode, pdaLinkNode, pdaNode, programNode } from '@kinobi-so/nodes';
+import {
+    accountNode,
+    booleanTypeNode,
+    definedTypeLinkNode,
+    definedTypeNode,
+    enumEmptyVariantTypeNode,
+    enumTypeNode,
+    enumValueNode,
+    fieldDiscriminatorNode,
+    pdaLinkNode,
+    pdaNode,
+    programNode,
+    publicKeyTypeNode,
+    structFieldTypeNode,
+    structTypeNode,
+} from '@kinobi-so/nodes';
 import { visit } from '@kinobi-so/visitors-core';
 import { test } from 'vitest';
 
@@ -24,3 +39,44 @@ test('it renders PDA helpers for PDA with no seeds', async () => {
         'await findBarPda({ programAddress })',
     ]);
 });
+
+test('it renders an account with a defined type link as discriminator', async () => {
+    // Given the following program with 1 account with a discriminator.
+    const node = programNode({
+        accounts: [
+            accountNode({
+                data: structTypeNode([
+                    structFieldTypeNode({
+                        defaultValue: enumValueNode('key', 'Asset'),
+                        defaultValueStrategy: 'omitted',
+                        name: 'key',
+                        type: definedTypeLinkNode('Key'),
+                    }),
+                    structFieldTypeNode({
+                        name: 'mutable',
+                        type: booleanTypeNode(),
+                    }),
+                    structFieldTypeNode({
+                        name: 'owner',
+                        type: publicKeyTypeNode(),
+                    }),
+                ]),
+                discriminators: [fieldDiscriminatorNode('key', 0)],
+                name: 'asset',
+            }),
+        ],
+        definedTypes: [
+            definedTypeNode({
+                name: 'key',
+                type: enumTypeNode([enumEmptyVariantTypeNode('Uninitialized'), enumEmptyVariantTypeNode('Asset')]),
+            }),
+        ],
+        name: 'splToken',
+        publicKey: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
+    });
+
+    const renderMap = visit(node, getRenderMapVisitor());
+
+    // Then we expect the following import list with a reference to the disciminator type.
+    await renderMapContains(renderMap, 'accounts/asset.ts', ['import { Key, getKeyDecoder, getKeyEncoder }']);
+});