@macalinao/codama-rename-visitor 0.3.3 → 0.4.1

package/dist/rename-visitor.js

@@ -1,75 +1,28 @@
-import { bottomUpTransformerVisitor, rootNodeVisitor, visit } from "codama";
 import { renameAccountTransform } from "./rename-accounts-visitor.js";
 import { renameDefinedTypeTransform } from "./rename-defined-types-visitor.js";
 import { renameInstructionTransform } from "./rename-instructions-visitor.js";
+import { bottomUpTransformerVisitor, rootNodeVisitor, visit } from "codama";
+//#region src/rename-visitor.ts
 /**
- * Creates a visitor that renames accounts, instructions, and defined types in specific programs.
- * This follows the same pattern as addPdasVisitor from Codama.
- *
- * @param renamesByProgram - Object mapping program names to their rename configurations
- * @returns A root node visitor that performs all specified renames
- *
- * @example
- * ```typescript
- * const visitor = renameVisitor({
- *   quarryMine: {
- *     instructions: {
- *       claimRewards: "claimRewardsMine"
- *     },
- *     accounts: {
- *       miner: "minerAccount"
- *     }
- *   },
- *   token: {
- *     instructions: {
- *       transfer: "transferTokens",
- *       mint: "mintNft"
- *     },
- *     definedTypes: {
- *       tokenData: "tokenMetadata"
- *     }
- *   }
- * });
- * codama.update(visitor);
- * ```
- */
-export function renameVisitor(renamesByProgram) {
-    return rootNodeVisitor((root) => {
-        const transforms = [];
-        // Process each program's rename configuration
-        Object.entries(renamesByProgram).forEach(([programName, renameOptions]) => {
-            // Add instruction renames for this program
-            if (renameOptions.instructions) {
-                Object.entries(renameOptions.instructions).forEach(([oldName, newName]) => {
-                    transforms.push({
-                        select: `[programNode]${programName}.[instructionNode]${oldName}`,
-                        transform: (node) => renameInstructionTransform(node, { [oldName]: newName }),
-                    });
-                });
-            }
-            if (renameOptions.accounts) {
-                Object.entries(renameOptions.accounts).forEach(([oldName, newName]) => {
-                    transforms.push({
-                        select: `[programNode]${programName}.[accountNode]${oldName}`,
-                        transform: (node) => renameAccountTransform(node, { [oldName]: newName }),
-                    });
-                });
-            }
-            // Add defined type renames for this program
-            if (renameOptions.definedTypes) {
-                Object.entries(renameOptions.definedTypes ?? {}).forEach(([oldName, newName]) => {
-                    transforms.push({
-                        select: `[programNode]${programName}.[definedTypeNode]${oldName}`,
-                        transform: (node) => renameDefinedTypeTransform(node, { [oldName]: newName }),
-                    });
-                });
-            }
-        });
-        if (transforms.length === 0) {
-            return root;
-        }
-        const visitor = bottomUpTransformerVisitor(transforms);
-        return visit(root, visitor);
-    });
+* Builds a transform for each entry of a rename record, targeting nodes of the
+* given kind within the given program.
+*/
+function buildRenameTransforms(programName, nodeKind, renames, rename) {
+	if (!renames) return [];
+	return Object.entries(renames).map(([oldName, newName]) => ({
+		select: `[programNode]${programName}.[${nodeKind}]${oldName}`,
+		transform: (node) => rename(node, { [oldName]: newName })
+	}));
+}
+function renameVisitor(renamesByProgram) {
+	return rootNodeVisitor((root) => {
+		const transforms = [];
+		for (const [programName, renameOptions] of Object.entries(renamesByProgram)) transforms.push(...buildRenameTransforms(programName, "instructionNode", renameOptions.instructions, renameInstructionTransform), ...buildRenameTransforms(programName, "accountNode", renameOptions.accounts, renameAccountTransform), ...buildRenameTransforms(programName, "definedTypeNode", renameOptions.definedTypes, renameDefinedTypeTransform));
+		if (transforms.length === 0) return root;
+		return visit(root, bottomUpTransformerVisitor(transforms));
+	});
 }
+//#endregion
+export { renameVisitor };
+
 //# sourceMappingURL=rename-visitor.js.map

package/dist/rename-visitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"rename-visitor.js","sourceRoot":"","sources":["../src/rename-visitor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,aAAa,CAC3B,gBAAsD;IAEtD,OAAO,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,UAAU,GAGV,EAAE,CAAC;QAET,8CAA8C;QAC9C,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,EAAE;YACxE,2CAA2C;YAC3C,IAAI,aAAa,CAAC,YAAY,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,OAAO,CAChD,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE;oBACrB,UAAU,CAAC,IAAI,CAAC;wBACd,MAAM,EAAE,gBAAgB,WAAW,qBAAqB,OAAO,EAAE;wBACjE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;qBAC3D,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;YAED,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE;oBACpE,UAAU,CAAC,IAAI,CAAC;wBACd,MAAM,EAAE,gBAAgB,WAAW,iBAAiB,OAAO,EAAE;wBAC7D,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;qBACvD,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;YAED,4CAA4C;YAC5C,IAAI,aAAa,CAAC,YAAY,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CACtD,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE;oBACrB,UAAU,CAAC,IAAI,CAAC;wBACd,MAAM,EAAE,gBAAgB,WAAW,qBAAqB,OAAO,EAAE;wBACjE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAClB,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;qBAC3D,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { Node } from \"codama\";\nimport type { ProgramRenameOptions } from \"./types.js\";\nimport { bottomUpTransformerVisitor, rootNodeVisitor, visit } from \"codama\";\nimport { renameAccountTransform } from \"./rename-accounts-visitor.js\";\nimport { renameDefinedTypeTransform } from \"./rename-defined-types-visitor.js\";\nimport { renameInstructionTransform } from \"./rename-instructions-visitor.js\";\n\n/**\n * Creates a visitor that renames accounts, instructions, and defined types in specific programs.\n * This follows the same pattern as addPdasVisitor from Codama.\n *\n * @param renamesByProgram - Object mapping program names to their rename configurations\n * @returns A root node visitor that performs all specified renames\n *\n * @example\n * ```typescript\n * const visitor = renameVisitor({\n *   quarryMine: {\n *     instructions: {\n *       claimRewards: \"claimRewardsMine\"\n *     },\n *     accounts: {\n *       miner: \"minerAccount\"\n *     }\n *   },\n *   token: {\n *     instructions: {\n *       transfer: \"transferTokens\",\n *       mint: \"mintNft\"\n *     },\n *     definedTypes: {\n *       tokenData: \"tokenMetadata\"\n *     }\n *   }\n * });\n * codama.update(visitor);\n * ```\n */\nexport function renameVisitor(\n  renamesByProgram: Record<string, ProgramRenameOptions>,\n): ReturnType<typeof rootNodeVisitor> {\n  return rootNodeVisitor((root) => {\n    const transforms: {\n      select: string;\n      transform: (node: Node) => Node | null;\n    }[] = [];\n\n    // Process each program's rename configuration\n    Object.entries(renamesByProgram).forEach(([programName, renameOptions]) => {\n      // Add instruction renames for this program\n      if (renameOptions.instructions) {\n        Object.entries(renameOptions.instructions).forEach(\n          ([oldName, newName]) => {\n            transforms.push({\n              select: `[programNode]${programName}.[instructionNode]${oldName}`,\n              transform: (node) =>\n                renameInstructionTransform(node, { [oldName]: newName }),\n            });\n          },\n        );\n      }\n\n      if (renameOptions.accounts) {\n        Object.entries(renameOptions.accounts).forEach(([oldName, newName]) => {\n          transforms.push({\n            select: `[programNode]${programName}.[accountNode]${oldName}`,\n            transform: (node) =>\n              renameAccountTransform(node, { [oldName]: newName }),\n          });\n        });\n      }\n\n      // Add defined type renames for this program\n      if (renameOptions.definedTypes) {\n        Object.entries(renameOptions.definedTypes ?? {}).forEach(\n          ([oldName, newName]) => {\n            transforms.push({\n              select: `[programNode]${programName}.[definedTypeNode]${oldName}`,\n              transform: (node) =>\n                renameDefinedTypeTransform(node, { [oldName]: newName }),\n            });\n          },\n        );\n      }\n    });\n\n    if (transforms.length === 0) {\n      return root;\n    }\n\n    const visitor = bottomUpTransformerVisitor(transforms);\n    return visit(root, visitor);\n  });\n}\n"]}
+{"version":3,"file":"rename-visitor.js","names":[],"sources":["../src/rename-visitor.ts"],"sourcesContent":["import type { Node, Visitor } from \"codama\";\nimport type { ProgramRenameOptions } from \"./types.js\";\nimport { bottomUpTransformerVisitor, rootNodeVisitor, visit } from \"codama\";\nimport { renameAccountTransform } from \"./rename-accounts-visitor.js\";\nimport { renameDefinedTypeTransform } from \"./rename-defined-types-visitor.js\";\nimport { renameInstructionTransform } from \"./rename-instructions-visitor.js\";\n\n/**\n * Creates a visitor that renames accounts, instructions, and defined types in specific programs.\n * This follows the same pattern as addPdasVisitor from Codama.\n *\n * @param renamesByProgram - Object mapping program names to their rename configurations\n * @returns A root node visitor that performs all specified renames\n *\n * @example\n * ```typescript\n * const visitor = renameVisitor({\n *   quarryMine: {\n *     instructions: {\n *       claimRewards: \"claimRewardsMine\"\n *     },\n *     accounts: {\n *       miner: \"minerAccount\"\n *     }\n *   },\n *   token: {\n *     instructions: {\n *       transfer: \"transferTokens\",\n *       mint: \"mintNft\"\n *     },\n *     definedTypes: {\n *       tokenData: \"tokenMetadata\"\n *     }\n *   }\n * });\n * codama.update(visitor);\n * ```\n */\ninterface RenameTransform {\n  select: string;\n  transform: (node: Node) => Node | null;\n}\n\n/**\n * Builds a transform for each entry of a rename record, targeting nodes of the\n * given kind within the given program.\n */\nfunction buildRenameTransforms(\n  programName: string,\n  nodeKind: string,\n  renames: Record<string, string> | undefined,\n  rename: (node: Node, mapping: Record<string, string>) => Node | null,\n): RenameTransform[] {\n  if (!renames) {\n    return [];\n  }\n  return Object.entries(renames).map(([oldName, newName]) => ({\n    select: `[programNode]${programName}.[${nodeKind}]${oldName}`,\n    transform: (node: Node) => rename(node, { [oldName]: newName }),\n  }));\n}\n\nexport function renameVisitor(\n  renamesByProgram: Record<string, ProgramRenameOptions>,\n): Visitor<Node | null, \"rootNode\"> {\n  return rootNodeVisitor<Node | null>((root) => {\n    const transforms: RenameTransform[] = [];\n\n    // Process each program's rename configuration\n    for (const [programName, renameOptions] of Object.entries(\n      renamesByProgram,\n    )) {\n      transforms.push(\n        ...buildRenameTransforms(\n          programName,\n          \"instructionNode\",\n          renameOptions.instructions,\n          renameInstructionTransform,\n        ),\n        ...buildRenameTransforms(\n          programName,\n          \"accountNode\",\n          renameOptions.accounts,\n          renameAccountTransform,\n        ),\n        ...buildRenameTransforms(\n          programName,\n          \"definedTypeNode\",\n          renameOptions.definedTypes,\n          renameDefinedTypeTransform,\n        ),\n      );\n    }\n\n    if (transforms.length === 0) {\n      return root;\n    }\n\n    const visitor = bottomUpTransformerVisitor(transforms);\n    return visit(root, visitor);\n  });\n}\n"],"mappings":";;;;;;;;;AA+CA,SAAS,sBACP,aACA,UACA,SACA,QACmB;CACnB,IAAI,CAAC,SACH,OAAO,CAAC;CAEV,OAAO,OAAO,QAAQ,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,cAAc;EAC1D,QAAQ,gBAAgB,YAAY,IAAI,SAAS,GAAG;EACpD,YAAY,SAAe,OAAO,MAAM,GAAG,UAAU,QAAQ,CAAC;CAChE,EAAE;AACJ;AAEA,SAAgB,cACd,kBACkC;CAClC,OAAO,iBAA8B,SAAS;EAC5C,MAAM,aAAgC,CAAC;EAGvC,KAAK,MAAM,CAAC,aAAa,kBAAkB,OAAO,QAChD,gBACF,GACE,WAAW,KACT,GAAG,sBACD,aACA,mBACA,cAAc,cACd,0BACF,GACA,GAAG,sBACD,aACA,eACA,cAAc,UACd,sBACF,GACA,GAAG,sBACD,aACA,mBACA,cAAc,cACd,0BACF,CACF;EAGF,IAAI,WAAW,WAAW,GACxB,OAAO;EAIT,OAAO,MAAM,MADG,2BAA2B,UAClB,CAAC;CAC5B,CAAC;AACH"}

package/dist/types.d.ts

@@ -1,12 +1,15 @@
+//#region src/types.d.ts
 /**
- * Rename mapping for a single program
- */
-export interface ProgramRenameOptions {
-    /** Mapping of old account names to new account names */
-    accounts?: Record<string, string>;
-    /** Mapping of old instruction names to new instruction names */
-    instructions?: Record<string, string>;
-    /** Mapping of old defined type names to new defined type names */
-    definedTypes?: Record<string, string>;
+* Rename mapping for a single program
+*/
+interface ProgramRenameOptions {
+  /** Mapping of old account names to new account names */
+  accounts?: Record<string, string>;
+  /** Mapping of old instruction names to new instruction names */
+  instructions?: Record<string, string>;
+  /** Mapping of old defined type names to new defined type names */
+  definedTypes?: Record<string, string>;
 }
+//#endregion
+export { ProgramRenameOptions };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../src/types.ts"],"mappings":";;AAGA;;UAAiB,oBAAA;;EAEf,QAAA,GAAW,MAAA;;EAEX,YAAA,GAAe,MAAA;EAEA;EAAf,YAAA,GAAe,MAAA;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macalinao/codama-rename-visitor",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "description": "Codama visitor for renaming instructions and events within a program",
   "type": "module",
   "sideEffects": false,
@@ -39,19 +39,20 @@
     "directory": "packages/codama-rename-visitor"
   },
   "scripts": {
-    "build": "tsc",
-    "clean": "tsc --build --clean && rm -fr .eslintcache dist/ node_modules/ tsconfig.tsbuildinfo",
+    "build": "tsdown",
+    "clean": "rm -fr .eslintcache dist/ node_modules/ tsconfig.tsbuildinfo",
     "lint": "eslint . --cache",
     "test": "bun test src/"
   },
   "dependencies": {
-    "codama": "^1.5.0"
+    "codama": "^1.7.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.5",
-    "@macalinao/eslint-config": "^7.0.3",
+    "@types/bun": "^1.3.14",
+    "@macalinao/eslint-config": "^8.1.0",
     "@macalinao/tsconfig": "^3.2.5",
-    "eslint": "^9.39.2",
-    "typescript": "^5.9.3"
+    "eslint": "^10.4.1",
+    "typescript": "^6.0.3",
+    "tsdown": "^0.22.2"
   }
 }

package/src/rename-accounts-visitor.ts

@@ -1,4 +1,4 @@
-import type { AccountNode, Node, rootNodeVisitor } from "codama";
+import type { AccountNode, Node, Visitor } from "codama";
 import { assertIsNode, bottomUpTransformerVisitor, camelCase } from "codama";
 
 /**
@@ -40,7 +40,7 @@ export function renameAccountTransform(
  */
 export function renameAccountsVisitor(
   mapping: Record<string, string>,
-): ReturnType<typeof rootNodeVisitor> {
+): Visitor<Node | null, "rootNode"> {
   return bottomUpTransformerVisitor([
     {
       select: "[accountNode]",

package/src/rename-defined-types-visitor.ts

@@ -1,4 +1,4 @@
-import type { DefinedTypeNode, Node } from "codama";
+import type { DefinedTypeNode, Node, Visitor } from "codama";
 import {
   assertIsNode,
   bottomUpTransformerVisitor,
@@ -46,8 +46,8 @@ export function renameDefinedTypeTransform(
  */
 export function renameDefinedTypesVisitor(
   mapping: Record<string, string>,
-): ReturnType<typeof rootNodeVisitor> {
-  return rootNodeVisitor((root) => {
+): Visitor<Node | null, "rootNode"> {
+  return rootNodeVisitor<Node | null>((root) => {
     const typeVisitor = bottomUpTransformerVisitor([
       {
         select: "[definedTypeNode]",

package/src/rename-visitor.ts

@@ -1,4 +1,4 @@
-import type { Node } from "codama";
+import type { Node, Visitor } from "codama";
 import type { ProgramRenameOptions } from "./types.js";
 import { bottomUpTransformerVisitor, rootNodeVisitor, visit } from "codama";
 import { renameAccountTransform } from "./rename-accounts-visitor.js";
@@ -36,53 +36,61 @@ import { renameInstructionTransform } from "./rename-instructions-visitor.js";
  * codama.update(visitor);
  * ```
  */
+interface RenameTransform {
+  select: string;
+  transform: (node: Node) => Node | null;
+}
+
+/**
+ * Builds a transform for each entry of a rename record, targeting nodes of the
+ * given kind within the given program.
+ */
+function buildRenameTransforms(
+  programName: string,
+  nodeKind: string,
+  renames: Record<string, string> | undefined,
+  rename: (node: Node, mapping: Record<string, string>) => Node | null,
+): RenameTransform[] {
+  if (!renames) {
+    return [];
+  }
+  return Object.entries(renames).map(([oldName, newName]) => ({
+    select: `[programNode]${programName}.[${nodeKind}]${oldName}`,
+    transform: (node: Node) => rename(node, { [oldName]: newName }),
+  }));
+}
+
 export function renameVisitor(
   renamesByProgram: Record<string, ProgramRenameOptions>,
-): ReturnType<typeof rootNodeVisitor> {
-  return rootNodeVisitor((root) => {
-    const transforms: {
-      select: string;
-      transform: (node: Node) => Node | null;
-    }[] = [];
+): Visitor<Node | null, "rootNode"> {
+  return rootNodeVisitor<Node | null>((root) => {
+    const transforms: RenameTransform[] = [];
 
     // Process each program's rename configuration
-    Object.entries(renamesByProgram).forEach(([programName, renameOptions]) => {
-      // Add instruction renames for this program
-      if (renameOptions.instructions) {
-        Object.entries(renameOptions.instructions).forEach(
-          ([oldName, newName]) => {
-            transforms.push({
-              select: `[programNode]${programName}.[instructionNode]${oldName}`,
-              transform: (node) =>
-                renameInstructionTransform(node, { [oldName]: newName }),
-            });
-          },
-        );
-      }
-
-      if (renameOptions.accounts) {
-        Object.entries(renameOptions.accounts).forEach(([oldName, newName]) => {
-          transforms.push({
-            select: `[programNode]${programName}.[accountNode]${oldName}`,
-            transform: (node) =>
-              renameAccountTransform(node, { [oldName]: newName }),
-          });
-        });
-      }
-
-      // Add defined type renames for this program
-      if (renameOptions.definedTypes) {
-        Object.entries(renameOptions.definedTypes ?? {}).forEach(
-          ([oldName, newName]) => {
-            transforms.push({
-              select: `[programNode]${programName}.[definedTypeNode]${oldName}`,
-              transform: (node) =>
-                renameDefinedTypeTransform(node, { [oldName]: newName }),
-            });
-          },
-        );
-      }
-    });
+    for (const [programName, renameOptions] of Object.entries(
+      renamesByProgram,
+    )) {
+      transforms.push(
+        ...buildRenameTransforms(
+          programName,
+          "instructionNode",
+          renameOptions.instructions,
+          renameInstructionTransform,
+        ),
+        ...buildRenameTransforms(
+          programName,
+          "accountNode",
+          renameOptions.accounts,
+          renameAccountTransform,
+        ),
+        ...buildRenameTransforms(
+          programName,
+          "definedTypeNode",
+          renameOptions.definedTypes,
+          renameDefinedTypeTransform,
+        ),
+      );
+    }
 
     if (transforms.length === 0) {
       return root;