Use latest RenderMap type from renderers-core (#67)

Author: lorisleiva

.changeset/clean-dancers-go.md

@@ -0,0 +1,5 @@
+---
+'@codama/renderers-js': patch
+---
+
+Use latest RenderMap type from renderers-core

package.json

@@ -50,15 +50,15 @@
         "test:unit": "vitest run"
     },
     "dependencies": {
-        "@codama/errors": "^1.4.0",
-        "@codama/nodes": "^1.4.0",
-        "@codama/renderers-core": "^1.2.4",
-        "@codama/visitors-core": "^1.4.0",
+        "@codama/errors": "^1.4.1",
+        "@codama/nodes": "^1.4.1",
+        "@codama/renderers-core": "^1.3.0",
+        "@codama/visitors-core": "^1.4.1",
         "@solana/codecs-strings": "^5.0.0",
         "prettier": "^3.6.2"
     },
     "devDependencies": {
-        "@codama/nodes-from-anchor": "^1.3.0",
+        "@codama/nodes-from-anchor": "^1.3.3",
         "@changesets/changelog-github": "^0.5.1",
         "@changesets/cli": "^2.29.7",
         "@solana/eslint-config-solana": "^5.0.0",

pnpm-lock.yaml

@@ -82,7 +82,7 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}) {
     };
 
     return pipe(
-        staticVisitor(() => createRenderMap(), {
+        staticVisitor(() => createRenderMap<Fragment>(), {
             keys: ['rootNode', 'programNode', 'pdaNode', 'accountNode', 'definedTypeNode', 'instructionNode'],
         }),
         v =>

src/visitors/getRenderMapVisitor.ts

@@ -5,6 +5,8 @@ import * as typeScriptPlugin from 'prettier/plugins/typescript';
 import { format } from 'prettier/standalone';
 import { expect } from 'vitest';
 
+import type { Fragment } from '../src/utils';
+
 const PRETTIER_OPTIONS: Parameters<typeof format>[1] = {
     arrowParens: 'always',
     parser: 'typescript',
@@ -17,18 +19,22 @@ const PRETTIER_OPTIONS: Parameters<typeof format>[1] = {
     useTabs: false,
 };
 
-export function renderMapContains(renderMap: RenderMap, key: string, expected: (RegExp | string)[] | RegExp | string) {
+export function renderMapContains(
+    renderMap: RenderMap<Fragment>,
+    key: string,
+    expected: (RegExp | string)[] | RegExp | string,
+) {
     expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
-    return codeContains(getFromRenderMap(renderMap, key), expected);
+    return codeContains(getFromRenderMap(renderMap, key).content, expected);
 }
 
 export function renderMapDoesNotContain(
-    renderMap: RenderMap,
+    renderMap: RenderMap<Fragment>,
     key: string,
     expected: (RegExp | string)[] | RegExp | string,
 ) {
     expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
-    return codeDoesNotContain(getFromRenderMap(renderMap, key), expected);
+    return codeDoesNotContain(getFromRenderMap(renderMap, key).content, expected);
 }
 
 export async function codeContains(actual: string, expected: (RegExp | string)[] | RegExp | string) {
@@ -55,18 +61,22 @@ export async function codeDoesNotContain(actual: string, expected: (RegExp | str
     });
 }
 
-export function renderMapContainsImports(renderMap: RenderMap, key: string, expectedImports: Record<string, string[]>) {
+export function renderMapContainsImports(
+    renderMap: RenderMap<Fragment>,
+    key: string,
+    expectedImports: Record<string, string[]>,
+) {
     expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
-    return codeContainsImports(getFromRenderMap(renderMap, key), expectedImports);
+    return codeContainsImports(getFromRenderMap(renderMap, key).content, expectedImports);
 }
 
 export function renderMapDoesNotContainImports(
-    renderMap: RenderMap,
+    renderMap: RenderMap<Fragment>,
     key: string,
     expectedImports: Record<string, string[]>,
 ) {
     expect(renderMap.has(key), `RenderMap is missing key "${key}".`).toBe(true);
-    return codeDoesNotContainImports(getFromRenderMap(renderMap, key), expectedImports);
+    return codeDoesNotContainImports(getFromRenderMap(renderMap, key).content, expectedImports);
 }
 
 export async function codeContainsImports(actual: string, expectedImports: Record<string, string[]>) {

test/_setup.ts

@@ -110,7 +110,7 @@ test('it renders the args variable on the async function only if the extra argum
     const renderMap = visit(node, getRenderMapVisitor({ asyncResolvers: ['myAsyncResolver'] }));
 
     // And split the async and sync functions.
-    const [asyncFunction, syncFunction] = getFromRenderMap(renderMap, 'instructions/create.ts').split(
+    const [asyncFunction, syncFunction] = getFromRenderMap(renderMap, 'instructions/create.ts').content.split(
         /export\s+function\s+getCreateInstruction/,
     );
 
@@ -150,7 +150,7 @@ test('it only renders the args variable on the async function if the extra argum
     const renderMap = visit(node, getRenderMapVisitor({ asyncResolvers: ['myAsyncResolver'] }));
 
     // And split the async and sync functions.
-    const [asyncFunction, syncFunction] = getFromRenderMap(renderMap, 'instructions/create.ts').split(
+    const [asyncFunction, syncFunction] = getFromRenderMap(renderMap, 'instructions/create.ts').content.split(
         /export\s+function\s+getCreateInstruction/,
     );