Merge branch '0.21'

Author: lorisleiva

package.json

@@ -22,18 +22,18 @@
         "@typescript-eslint/parser": "^6.0.0",
         "agadoo": "^3.0.0",
         "eslint": "^8.57.0",
-        "eslint-config-turbo": "^2.0.14",
+        "eslint-config-turbo": "^2.1.1",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-sort-keys-fix": "^1.1.2",
         "eslint-plugin-typescript-sort-keys": "^3.2.0",
-        "happy-dom": "^14.12.3",
+        "happy-dom": "^15.7.3",
         "prettier": "^3.3.3",
         "rimraf": "6.0.1",
         "tsup": "^8.2.4",
-        "turbo": "^2.0.14",
+        "turbo": "^2.1.1",
         "typescript": "^5.5.4",
         "vitest": "^2.0.5",
-        "zx": "^8.1.4"
+        "zx": "^8.1.5"
     },
     "engines": {
         "node": ">=18.0.0"

packages/nodes-from-anchor/package.json

@@ -52,7 +52,7 @@
         "@kinobi-so/errors": "workspace:*",
         "@kinobi-so/nodes": "workspace:*",
         "@kinobi-so/visitors": "workspace:*",
-        "@noble/hashes": "^1.4.0"
+        "@noble/hashes": "^1.5.0"
     },
     "license": "MIT",
     "repository": {

packages/renderers-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @kinobi-so/renderers-js
 
+## 0.21.8
+
+### Patch Changes
+
+-   [#200](https://github.com/kinobi-so/kinobi/pull/200) [`6639091`](https://github.com/kinobi-so/kinobi/commit/6639091714ae3b5c4330f0b1f43816fea373d55f) Thanks [@lorisleiva](https://github.com/lorisleiva)! - Fix a bug that reuses the same `ImportMap` within different code fragments
+
 ## 0.21.7
 
 ### Patch Changes

packages/renderers-js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kinobi-so/renderers-js",
-    "version": "0.21.7",
+    "version": "0.21.8",
     "description": "JavaScript renderer compatible with the Solana web3.js library",
     "exports": {
         "types": "./dist/types/index.d.ts",

packages/renderers-js/src/fragments/common.ts

@@ -30,8 +30,8 @@ export class Fragment {
 
     constructor(render: string, imports?: ImportMap, features?: Set<FragmentFeature>) {
         this.render = render;
-        this.imports = imports ?? new ImportMap();
-        this.features = features ?? new Set();
+        this.imports = imports ? new ImportMap().mergeWith(imports) : new ImportMap();
+        this.features = new Set([...(features ?? [])]);
     }
 
     setRender(render: string): this {

packages/renderers-js/test/_setup.ts

@@ -21,6 +21,15 @@ export function renderMapContains(renderMap: RenderMap, key: string, expected: (
     return codeContains(renderMap.get(key), expected);
 }
 
+export function renderMapDoesNotContain(
+    renderMap: RenderMap,
+    key: string,
+    expected: (RegExp | string)[] | RegExp | string,
+) {
+    expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
+    return codeDoesNotContain(renderMap.get(key), expected);
+}
+
 export async function codeContains(actual: string, expected: (RegExp | string)[] | RegExp | string) {
     const expectedArray = Array.isArray(expected) ? expected : [expected];
     const normalizedActual = await normalizeCode(actual);
@@ -50,6 +59,15 @@ export function renderMapContainsImports(renderMap: RenderMap, key: string, expe
     return codeContainsImports(renderMap.get(key), expectedImports);
 }
 
+export function renderMapDoesNotContainImports(
+    renderMap: RenderMap,
+    key: string,
+    expectedImports: Record<string, string[]>,
+) {
+    expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
+    return codeDoesNotContainImports(renderMap.get(key), expectedImports);
+}
+
 export async function codeContainsImports(actual: string, expectedImports: Record<string, string[]>) {
     const normalizedActual = await inlineCode(actual);
     const importPairs = Object.entries(expectedImports).flatMap(([key, value]) => {
@@ -61,6 +79,17 @@ export async function codeContainsImports(actual: string, expectedImports: Recor
     });
 }
 
+export async function codeDoesNotContainImports(actual: string, expectedImports: Record<string, string[]>) {
+    const normalizedActual = await inlineCode(actual);
+    const importPairs = Object.entries(expectedImports).flatMap(([key, value]) => {
+        return value.map(v => [key, v] as const);
+    });
+
+    importPairs.forEach(([importFrom, importValue]) => {
+        expect(normalizedActual).not.toMatch(new RegExp(`import{[^}]*\\b${importValue}\\b[^}]*}from'${importFrom}'`));
+    });
+}
+
 export function codeStringAsRegex(code: string) {
     const stringAsRegex = escapeRegex(code)
         // Transform spaces between words into required whitespace.

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

@@ -1,6 +1,7 @@
 import {
     constantPdaSeedNodeFromString,
     numberTypeNode,
+    optionTypeNode,
     pdaNode,
     programNode,
     publicKeyTypeNode,
@@ -10,7 +11,7 @@ import { visit } from '@kinobi-so/visitors-core';
 import { test } from 'vitest';
 
 import { getRenderMapVisitor } from '../src';
-import { renderMapContains } from './_setup';
+import { renderMapContains, renderMapContainsImports, renderMapDoesNotContainImports } from './_setup';
 
 test('it renders a PDA helper function and its input type', async () => {
     // Given the following PDA node.
@@ -82,3 +83,30 @@ test('it renders an empty array of seeds for seedless PDAs', async () => {
         'getProgramDerivedAddress({ programAddress, seeds: [] })',
     ]);
 });
+
+test('it does not import strict types for variable seeds', async () => {
+    // Given the following PDA node.
+    const node = programNode({
+        name: 'myProgram',
+        pdas: [
+            pdaNode({
+                name: 'foo',
+                seeds: [variablePdaSeedNode('myAccount', optionTypeNode(publicKeyTypeNode()))],
+            }),
+        ],
+        publicKey: '1111',
+    });
+
+    // When we render it.
+    const renderMap = visit(node, getRenderMapVisitor());
+
+    // Then the `Option` string type should not be imported.
+    await renderMapDoesNotContainImports(renderMap, 'pdas/foo.ts', {
+        '@solana/web3.js': ['type Option'],
+    });
+
+    // But the `OptionOrNullable` loose type should be imported.
+    await renderMapContainsImports(renderMap, 'pdas/foo.ts', {
+        '@solana/web3.js': ['type OptionOrNullable'],
+    });
+});

packages/renderers/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @kinobi-so/renderers
 
+## 0.21.3
+
+### Patch Changes
+
+-   Updated dependencies [[`6639091`](https://github.com/kinobi-so/kinobi/commit/6639091714ae3b5c4330f0b1f43816fea373d55f)]:
+    -   @kinobi-so/renderers-js@0.21.8
+
 ## 0.21.2
 
 ### Patch Changes

packages/renderers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kinobi-so/renderers",
-    "version": "0.21.2",
+    "version": "0.21.3",
     "description": "Exports all Kinobi renderers",
     "exports": {
         "types": "./dist/types/index.d.ts",