codama-renderers-dart 0.4.2 → 0.5.0

package/dist/types/fragments/instructionPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instructionPage.d.ts","sourceRoot":"","sources":["../../../src/fragments/instructionPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,WAAW,GACjB,QAAQ,CA4PV"}
+{"version":3,"file":"instructionPage.d.ts","sourceRoot":"","sources":["../../../src/fragments/instructionPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,WAAW,GACjB,QAAQ,CAkQV"}

package/dist/types/fragments/programPage.d.ts

@@ -1,4 +1,4 @@
-import type { ProgramNode } from "@codama/nodes";
+import { type ProgramNode } from "@codama/nodes";
 import type { Fragment } from "../utils/fragment.js";
 import type { RenderScope } from "../utils/options.js";
 /**

package/dist/types/fragments/programPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"programPage.d.ts","sourceRoot":"","sources":["../../../src/fragments/programPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,WAAW,GACjB,QAAQ,CAgEV"}
+{"version":3,"file":"programPage.d.ts","sourceRoot":"","sources":["../../../src/fragments/programPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,WAAW,GACjB,QAAQ,CAiJV"}

package/dist/types/utils/importMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importMap.d.ts","sourceRoot":"","sources":["../../../src/utils/importMap.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAsB5D,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAqB;IAErC;;;OAGG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKzB;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAOrC;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAEzB;IAED;;;OAGG;IACH,OAAO,CAAC,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,MAAM,EAAE;IA2B3D;;OAEG;IACH,QAAQ,CAAC,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,MAAM;CAyB3D"}
+{"version":3,"file":"importMap.d.ts","sourceRoot":"","sources":["../../../src/utils/importMap.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAsB5D,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAqB;IAErC;;;OAGG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKzB;;OAEG;IACH,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAOrC;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAEzB;IAED;;;OAGG;IACH,OAAO,CAAC,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,MAAM,EAAE;IAgC3D;;OAEG;IACH,QAAQ,CAAC,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,MAAM;CAyB3D"}

package/dist/types/utils/nameTransformers.d.ts

@@ -44,7 +44,7 @@ export interface DartNameApi {
     errorMessageFunction(name: string): string;
     /** Enum variant: `camelCase` */
     enumVariant(name: string): string;
-    /** Sealed class variant (data enum): `PascalCase` */
+    /** Sealed class variant (data enum): `{ParentName}{PascalCase}` */
     sealedClassVariant(parentName: string, variantName: string): string;
     /** File name: `snake_case.dart` */
     fileName(name: string): string;

package/dist/types/utils/nameTransformers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nameTransformers.d.ts","sourceRoot":"","sources":["../../../src/utils/nameTransformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD;;GAEG;AAEH,qCAAqC;AACrC,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI9C;AAED,oCAAoC;AACpC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,qCAAqC;AACrC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO7C;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,oCAAoC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,sDAAsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,sDAAsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,kDAAkD;IAClD,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,kDAAkD;IAClD,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,6DAA6D;IAC7D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAChD,oDAAoD;IACpD,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,+CAA+C;IAC/C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1C,iDAAiD;IACjD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,iEAAiE;IACjE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1C,iEAAiE;IACjE,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,4DAA4D;IAC5D,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7C,4DAA4D;IAC5D,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9D,4DAA4D;IAC5D,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,gCAAgC;IAChC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,qDAAqD;IACrD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IACpE,mCAAmC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,yDAAyD;IACzD,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,oDAAoD;IACpD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACtC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAuB/C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAEhE"}
+{"version":3,"file":"nameTransformers.d.ts","sourceRoot":"","sources":["../../../src/utils/nameTransformers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD;;GAEG;AAEH,qCAAqC;AACrC,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI9C;AAED,oCAAoC;AACpC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,qCAAqC;AACrC,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO7C;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,oCAAoC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,sDAAsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,sDAAsD;IACtD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,kDAAkD;IAClD,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,kDAAkD;IAClD,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,6DAA6D;IAC7D,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAChD,oDAAoD;IACpD,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,+CAA+C;IAC/C,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1C,iDAAiD;IACjD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtC,iEAAiE;IACjE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1C,iEAAiE;IACjE,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,4DAA4D;IAC5D,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7C,4DAA4D;IAC5D,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9D,4DAA4D;IAC5D,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3C,gCAAgC;IAChC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAClC,mEAAmE;IACnE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IACpE,mCAAmC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,yDAAyD;IACzD,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,oDAAoD;IACpD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACtC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAwB/C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAEhE"}

package/dist/types/visitors/getTypeManifestVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTypeManifestVisitor.d.ts","sourceRoot":"","sources":["../../../src/visitors/getTypeManifestVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,eAAe,EA8BrB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,OAAO,EAIb,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAEL,KAAK,YAAY,EAKlB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAa,MAAM,8BAA8B,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE5E;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;CACpC,6xDAymBA"}
+{"version":3,"file":"getTypeManifestVisitor.d.ts","sourceRoot":"","sources":["../../../src/visitors/getTypeManifestVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,eAAe,EA8BrB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,OAAO,EAIb,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAEL,KAAK,YAAY,EAKlB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAa,MAAM,8BAA8B,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE5E;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE;IAC5C,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;CACpC,6xDA6mBA"}

package/dist/types/visitors/renderVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderVisitor.d.ts","sourceRoot":"","sources":["../../../src/visitors/renderVisitor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKzD;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,aAAkB,6DA+D5B"}
+{"version":3,"file":"renderVisitor.d.ts","sourceRoot":"","sources":["../../../src/visitors/renderVisitor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKzD;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,aAAkB,6DAmE5B"}

package/package.json

@@ -9,7 +9,12 @@
   "devDependencies": {
     "@codama/nodes-from-anchor": "^1.3.9",
     "@codama/renderers-js": "^2.0.2",
-    "@vitest/coverage-v8": "4.1.0"
+    "@types/node": "25.3.0",
+    "@vitest/coverage-v8": "4.1.0",
+    "rimraf": "6.1.3",
+    "tsup": "8.5.1",
+    "typescript": "5.9.3",
+    "vitest": "4.1.0"
   },
   "engines": {
     "node": ">=18"
@@ -45,6 +50,9 @@
     "access": "public"
   },
   "repository": "https://github.com/openbudgetfun/solana_kit/tree/main/packages/codama-renderers-dart",
+  "type": "module",
+  "types": "./dist/types/index.d.ts",
+  "version": "0.5.0",
   "scripts": {
     "build": "pnpm exec rimraf dist && pnpm exec tsup && pnpm exec tsc -p tsconfig.declarations.json",
     "lint": "eslint --ext .ts src",
@@ -52,8 +60,5 @@
     "test:coverage": "pnpm exec vitest run --coverage.enabled --coverage.reporter=lcov",
     "test:watch": "pnpm exec vitest",
     "typecheck": "pnpm exec tsc --noEmit"
-  },
-  "type": "module",
-  "types": "./dist/types/index.d.ts",
-  "version": "0.4.2"
-}
+  }
+}

package/readme.md

@@ -1,8 +1,6 @@
 # codama-renderers-dart
 
-[![pub package](https://img.shields.io/pub/v/codama-renderers-dart.svg)](https://pub.dev/packages/codama-renderers-dart)
-[![CI](https://github.com/openbudgetfun/solana_kit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/openbudgetfun/solana_kit/actions/workflows/ci.yml)
-[![Coverage](https://codecov.io/gh/openbudgetfun/solana_kit/branch/main/graph/badge.svg?flag=codama-renderers-dart)](https://codecov.io/gh/openbudgetfun/solana_kit?flag=codama-renderers-dart)
+[![pub package](https://img.shields.io/pub/v/codama-renderers-dart.svg)](https://pub.dev/packages/codama-renderers-dart) [![CI](https://github.com/openbudgetfun/solana_kit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/openbudgetfun/solana_kit/actions/workflows/ci.yml) [![Coverage](https://codecov.io/gh/openbudgetfun/solana_kit/branch/main/graph/badge.svg?flag=codama-renderers-dart)](https://codecov.io/gh/openbudgetfun/solana_kit?flag=codama-renderers-dart)
 
 A [Codama](https://github.com/codama-idl/codama) renderer that generates Dart code targeting the [solana_kit](https://github.com/openbudgetfun/solana_kit) SDK.
 

package/src/fragments/instructionPage.ts

@@ -134,7 +134,11 @@ export function getInstructionPageFragment(
       const manifest = argManifestMap.get(arg)!;
       const fieldName = camelCase(arg.name as string);
       const typeStr = manifest.type.content;
-      const hasDefault = arg.defaultValue != null;
+      // Account bumps require asynchronous PDA derivation, so callers must
+      // provide them instead of relying on a synchronous generated default.
+      const hasDefault =
+        arg.defaultValue != null &&
+        arg.defaultValue.kind !== "accountBumpValueNode";
       if (hasDefault) {
         // Don't add `?` if the type is already nullable.
         const nullableType = typeStr.endsWith("?") ? typeStr : `${typeStr}?`;
@@ -165,7 +169,9 @@ export function getInstructionPageFragment(
         return ""; // Use default
       }
       // Use 'arg_<name>' prefix to reference builder params without shadowing.
-      return `      ${fieldName}: ${fieldName}${arg.defaultValue != null ? ` ?? ${getDefaultValue(arg)}` : ""},`;
+      const typeStr2 = argManifestMap.get(arg)?.type.content;
+      const skipDefault = arg.defaultValue?.kind === "accountBumpValueNode";
+      return `      ${fieldName}: ${fieldName}${arg.defaultValue != null && !skipDefault ? ` ?? ${getDefaultValue(arg, typeStr2)}` : ""},`;
     })
     .filter(Boolean)
     .join("\n");
@@ -329,12 +335,17 @@ function isConstDefaultValue(defaultValue: InstructionArgumentNode["defaultValue
   }
 }
 
-function getDefaultValue(arg: InstructionArgumentNode): string {
+function getDefaultValue(
+  arg: InstructionArgumentNode,
+  typeStr?: string,
+): string {
   if (!arg.defaultValue) return "null";
+  const isBigInt = typeStr === "BigInt";
   const dv = arg.defaultValue;
   switch (dv.kind) {
     case "numberValueNode":
-      return String(dv.number);
+      // Dart's `BigInt` requires a constructor; `0` is not assignable to `BigInt`.
+      return isBigInt ? `BigInt.from(${dv.number})` : String(dv.number);
     case "booleanValueNode":
       return String(dv.boolean);
     case "stringValueNode":

package/src/fragments/programPage.ts

@@ -1,4 +1,10 @@
-import type { ProgramNode } from "@codama/nodes";
+import {
+  getAllInstructionsWithSubs,
+  type InstructionNode,
+  type ProgramNode,
+  type ValueNode,
+} from "@codama/nodes";
+import { visit } from "@codama/visitors-core";
 
 import type { Fragment } from "../utils/fragment.js";
 import {
@@ -67,19 +73,172 @@ ${fragmentFromString(accountVariants)}
 }`);
   }
 
-  // Instruction identifier enum
-  const instructions = node.instructions ?? [];
+  // Instruction identification and parsing helpers.
+  const instructions = getAllInstructionsWithSubs(node);
   if (instructions.length > 0) {
+    const programName = pascalCase(name);
+    const instructionEnum = `${programName}Instruction`;
     const instrVariants = instructions
       .map((instr) => `  ${camelCase(instr.name as string)},`)
       .join("\n");
 
     parts.push(fragment`
-/// Known instructions for the ${fragmentFromString(pascalCase(name))} program.
-enum ${fragmentFromString(pascalCase(name))}Instruction {
+/// Known instructions for the ${fragmentFromString(programName)} program.
+enum ${fragmentFromString(instructionEnum)} {
 ${fragmentFromString(instrVariants)}
 }`);
+
+    const identifiableInstructions = instructions
+      .map((instruction) => ({
+        instruction,
+        condition: getInstructionDiscriminatorCondition(instruction, scope),
+      }))
+      .filter(({ condition }) => condition !== null) as {
+        instruction: InstructionNode;
+        condition: Fragment;
+      }[];
+
+    if (identifiableInstructions.length > 0) {
+      const identifyBranches = identifiableInstructions.map(
+        ({ instruction, condition }) => fragment`  if (${condition}) {
+    return ${fragmentFromString(instructionEnum)}.${fragmentFromString(camelCase(instruction.name as string))};
+  }`,
+      );
+      const parsedBase = `Parsed${programName}Instruction`;
+      const parsedClasses = instructions.map((instruction) => {
+        const instructionName = pascalCase(instruction.name as string);
+        const variant = camelCase(instruction.name as string);
+        const parsedClass = `Parsed${instructionName}`;
+        const dataClass = `${instructionName}InstructionData`;
+        return fragment`/// A parsed ${fragmentFromString(instructionName)} instruction.
+final class ${fragmentFromString(parsedClass)} extends ${fragmentFromString(parsedBase)} {
+  const ${fragmentFromString(parsedClass)}({required this.data})
+      : super(${fragmentFromString(instructionEnum)}.${fragmentFromString(variant)});
+
+  final ${use(dataClass, "../instructions/instructions.dart")} data;
+}`;
+      });
+      const parseBranches = instructions.map((instruction) => {
+        const instructionName = pascalCase(instruction.name as string);
+        const variant = camelCase(instruction.name as string);
+        const parsedClass = `Parsed${instructionName}`;
+        const parseFunction = scope.nameApi.instructionParseFunction(
+          instruction.name as string,
+        );
+        return fragment`    ${fragmentFromString(instructionEnum)}.${fragmentFromString(variant)} => ${fragmentFromString(parsedClass)}(
+      data: ${use(parseFunction, "../instructions/instructions.dart")}(instruction),
+    ),`;
+      });
+
+      parts.push(fragment`
+/// Identifies the type of a ${fragmentFromString(programName)} instruction.
+${fragmentFromString(instructionEnum)} identify${fragmentFromString(programName)}Instruction(
+  ${use("Uint8List", "dartTypedData")} data,
+) {
+${mergeFragments(identifyBranches, (cs) => cs.join("\n"))}
+
+  throw ${use("SolanaError", "solanaErrors")}(
+    ${use("SolanaErrorCode", "solanaErrors")}.programClientsFailedToIdentifyInstruction,
+    {
+      'instructionData': data,
+      'programName': '${fragmentFromString(name)}',
+    },
+  );
+}
+
+/// A parsed instruction from the ${fragmentFromString(programName)} program.
+sealed class ${fragmentFromString(parsedBase)} {
+  const ${fragmentFromString(parsedBase)}(this.instructionType);
+
+  final ${fragmentFromString(instructionEnum)} instructionType;
+}
+
+${mergeFragments(parsedClasses, (cs) => cs.join("\n\n"))}
+
+/// Parses a ${fragmentFromString(programName)} instruction.
+${fragmentFromString(parsedBase)} parse${fragmentFromString(programName)}Instruction(
+  ${use("Instruction", "solanaInstructions")} instruction,
+) {
+  return switch (identify${fragmentFromString(programName)}Instruction(
+    instruction.data ?? Uint8List(0),
+  )) {
+${mergeFragments(parseBranches, (cs) => cs.join("\n"))}
+  };
+}`);
+    }
   }
 
   return mergeFragments(parts, (cs) => cs.join("\n"));
-}
+}
+
+function getInstructionDiscriminatorCondition(
+  instruction: InstructionNode,
+  scope: RenderScope,
+): Fragment | null {
+  const discriminators = instruction.discriminators ?? [];
+  if (discriminators.length === 0) return null;
+
+  const conditions = discriminators.map((discriminator): Fragment | null => {
+    switch (discriminator.kind) {
+      case "sizeDiscriminatorNode":
+        return fragment`data.length == ${discriminator.size}`;
+      case "constantDiscriminatorNode": {
+        const manifest = visit(
+          discriminator.constant.type,
+          scope.typeManifestVisitor,
+        );
+        const value = getValueFragment(
+          discriminator.constant.value,
+          manifest.type.content,
+        );
+        if (value === null) return null;
+        return fragment`${use("containsBytes", "solanaCodecsCore")}(data, ${manifest.encoder}.encode(${value}), ${discriminator.offset})`;
+      }
+      case "fieldDiscriminatorNode": {
+        const argument = (instruction.arguments ?? []).find(
+          (candidate) => candidate.name === discriminator.name,
+        );
+        if (argument?.defaultValue == null) return null;
+        const manifest = visit(argument.type, scope.typeManifestVisitor);
+        const value = getValueFragment(
+          argument.defaultValue,
+          manifest.type.content,
+        );
+        if (value === null) return null;
+        return fragment`${use("containsBytes", "solanaCodecsCore")}(data, ${manifest.encoder}.encode(${value}), ${discriminator.offset})`;
+      }
+    }
+  });
+
+  if (conditions.some((condition) => condition === null)) return null;
+  return mergeFragments(conditions as Fragment[], (cs) => cs.join(" && "));
+}
+
+function getValueFragment(
+  value:
+    | ValueNode
+    | NonNullable<
+        NonNullable<InstructionNode["arguments"]>[number]["defaultValue"]
+      >,
+  dartType?: string,
+): Fragment | null {
+  switch (value.kind) {
+    case "numberValueNode":
+      return fragmentFromString(
+        dartType === "BigInt"
+          ? `BigInt.from(${value.number})`
+          : String(value.number),
+      );
+    case "booleanValueNode":
+      return fragmentFromString(String(value.boolean));
+    case "stringValueNode":
+      return fragmentFromString(`'${value.string.replaceAll("'", "\\'")}'`);
+    case "bytesValueNode": {
+      const clean = value.data.replace(/^0x/, "");
+      const bytes = clean.match(/.{1,2}/g)?.map((byte) => parseInt(byte, 16)) ?? [];
+      return fragment`${use("Uint8List", "dartTypedData")}.fromList([${fragmentFromString(bytes.join(", "))}])`;
+    }
+    default:
+      return null;
+  }
+}

package/src/fragments/typePage.ts

@@ -132,6 +132,7 @@ function getDataEnumPageFragment(
 
   for (let i = 0; i < enumNode.variants.length; i++) {
     const variant = enumNode.variants[i];
+    const variantName = pascalCase(variant.name as string);
     const variantClassName = scope.nameApi.sealedClassVariant(
       name,
       variant.name as string,
@@ -149,7 +150,7 @@ function getDataEnumPageFragment(
   int get hashCode => runtimeType.hashCode;
 
   @override
-  String toString() => '${typeName}.${variantClassName}()';
+  String toString() => '${typeName}.${variantName}()';
 }`);
 
       encoderVariants.push(
@@ -217,7 +218,7 @@ ${fieldDecls}
   int get hashCode => ${hashExpression};
 
   @override
-  String toString() => '${typeName}.${variantClassName}(${toStringFields})';
+  String toString() => '${typeName}.${variantName}(${toStringFields})';
 }`);
 
       const encFields = fieldManifests
@@ -288,7 +289,7 @@ ${fieldDecls}
   int get hashCode => value.hashCode;
 
   @override
-  String toString() => '${typeName}.${variantClassName}(\$value)';
+  String toString() => '${typeName}.${variantName}(\$value)';
 }`);
         encoderVariants.push(
           `(${i}, transformEncoder<${manifest.type.content}, Map<String, Object?>>(${manifest.encoder.content}, (Map<String, Object?> map) => map['value']! as ${manifest.type.content}))`,

package/src/utils/importMap.ts

@@ -77,15 +77,20 @@ export class DartImportMap {
     for (const module of this._imports) {
       // Check internal map first (generated cross-references)
       if (module in internalMap) {
-        uris.add(internalMap[module]);
+        const uri = internalMap[module];
+        if (uri) {
+          uris.add(uri);
+        }
       }
       // Then external package map
       else if (module in DART_EXTERNAL_PACKAGE_MAP) {
         uris.add(DART_EXTERNAL_PACKAGE_MAP[module]);
       }
-      // Assume it's already a raw URI (e.g., "package:..." or relative path)
-      else {
+      // Finally, accept explicit Dart URIs and relative Dart paths.
+      else if (isRawDartImportUri(module)) {
         uris.add(module);
+      } else {
+        throw new Error(`Unresolved Dart import module "${module}"`);
       }
     }
 
@@ -127,3 +132,11 @@ export class DartImportMap {
     return lines.join("\n");
   }
 }
+
+function isRawDartImportUri(module: string): boolean {
+  return (
+    module.startsWith("dart:") ||
+    module.startsWith("package:") ||
+    (module.endsWith(".dart") && !module.includes(":"))
+  );
+}

package/src/utils/nameTransformers.ts

@@ -66,7 +66,7 @@ export interface DartNameApi {
   errorMessageFunction(name: string): string;
   /** Enum variant: `camelCase` */
   enumVariant(name: string): string;
-  /** Sealed class variant (data enum): `PascalCase` */
+  /** Sealed class variant (data enum): `{ParentName}{PascalCase}` */
   sealedClassVariant(parentName: string, variantName: string): string;
   /** File name: `snake_case.dart` */
   fileName(name: string): string;
@@ -97,7 +97,8 @@ export function createDartNameApi(): DartNameApi {
       `${camelCase(programName)}Error${pascalCase(errorName)}`,
     errorMessageFunction: (name) => `get${pascalCase(name)}ErrorMessage`,
     enumVariant: (name) => camelCase(name),
-    sealedClassVariant: (_parentName, variantName) => pascalCase(variantName),
+    sealedClassVariant: (parentName, variantName) =>
+      `${pascalCase(parentName)}${pascalCase(variantName)}`,
     isTypeFunction: (name) => `is${pascalCase(name)}`,
     fileName: (name) => snakeCase(name),
     discriminatorConstant: (name) => `${camelCase(name)}Discriminator`,

package/src/utils/wellKnownAddresses.ts

@@ -44,10 +44,10 @@ export const WELL_KNOWN_ADDRESSES: ReadonlyMap<string, string> = new Map([
 
   // SPL programs
   ['TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA', 'tokenProgramAddress'],
-  ['TokenzQdBNb4qyze1S1U9AHB8MGXmNK1REkTPT5Z3Y', 'token2022ProgramAddress'],
-  ['ATokenGPvbdGVxr1b2hvZbsiqW5xWH25ef7s3c8BnQKu', 'associatedTokenProgramAddress'],
-  ['Memo1UhkJRfRhVq1sR7Y7Nto1s3J2mXTT3L6Wk4K2m6', 'memoProgramAddress'],
-  ['MemoSq4gqABXKKYWVqKkV3m3kb1cTR7F2UMy9r6kFNK', 'memoLegacyProgramAddress'],
+  ['TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb', 'token2022ProgramAddress'],
+  ['ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL', 'associatedTokenProgramAddress'],
+  ['MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr', 'memoProgramAddress'],
+  ['Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo', 'memoLegacyProgramAddress'],
 
   // Metaplex programs
   ['metaqbxxU9qX8rZXkmUJ7haCrXXz2W1PSUq1Rn3E1od', 'tokenMetadataProgramAddress'],

package/src/visitors/getTypeManifestVisitor.ts

@@ -226,18 +226,19 @@ export function getTypeManifestVisitor(input: {
 
     visitArrayType(node: ArrayTypeNode, { self }) {
       const itemManifest = visit(node.item, self);
-      const sizeExpr = getArraySizeExpression(node);
+      const encoderSizeExpr = getArraySizeExpression(node, "Encoder");
+      const decoderSizeExpr = getArraySizeExpression(node, "Decoder");
 
       return {
         type: fragment`List<${itemManifest.type}>`,
         encoder: fragment`${use(
           "getArrayEncoder",
           "solanaCodecsDataStructures",
-        )}(${itemManifest.encoder}${sizeExpr})`,
+        )}(${itemManifest.encoder}${encoderSizeExpr})`,
         decoder: fragment`${use(
           "getArrayDecoder",
           "solanaCodecsDataStructures",
-        )}(${itemManifest.decoder}${sizeExpr})`,
+        )}(${itemManifest.decoder}${decoderSizeExpr})`,
         value: emptyTypeManifest().value,
         isEnum: false,
       };
@@ -246,18 +247,19 @@ export function getTypeManifestVisitor(input: {
     visitMapType(node: MapTypeNode, { self }) {
       const keyManifest = visit(node.key, self);
       const valueManifest = visit(node.value, self);
-      const sizeExpr = getMapSizeExpression(node);
+      const encoderSizeExpr = getMapSizeExpression(node, "Encoder");
+      const decoderSizeExpr = getMapSizeExpression(node, "Decoder");
 
       return {
         type: fragment`Map<${keyManifest.type}, ${valueManifest.type}>`,
         encoder: fragment`${use(
           "getMapEncoder",
           "solanaCodecsDataStructures",
-        )}(${keyManifest.encoder}, ${valueManifest.encoder}${sizeExpr})`,
+        )}(${keyManifest.encoder}, ${valueManifest.encoder}${encoderSizeExpr})`,
         decoder: fragment`${use(
           "getMapDecoder",
           "solanaCodecsDataStructures",
-        )}(${keyManifest.decoder}, ${valueManifest.decoder}${sizeExpr})`,
+        )}(${keyManifest.decoder}, ${valueManifest.decoder}${decoderSizeExpr})`,
         value: emptyTypeManifest().value,
         isEnum: false,
       };
@@ -265,18 +267,19 @@ export function getTypeManifestVisitor(input: {
 
     visitSetType(node: SetTypeNode, { self }) {
       const itemManifest = visit(node.item, self);
-      const sizeExpr = getSetSizeExpression(node);
+      const encoderSizeExpr = getSetSizeExpression(node, "Encoder");
+      const decoderSizeExpr = getSetSizeExpression(node, "Decoder");
 
       return {
         type: fragment`Set<${itemManifest.type}>`,
         encoder: fragment`${use(
           "getSetEncoder",
           "solanaCodecsDataStructures",
-        )}(${itemManifest.encoder}${sizeExpr})`,
+        )}(${itemManifest.encoder}${encoderSizeExpr})`,
         decoder: fragment`${use(
           "getSetDecoder",
           "solanaCodecsDataStructures",
-        )}(${itemManifest.decoder}${sizeExpr})`,
+        )}(${itemManifest.decoder}${decoderSizeExpr})`,
         value: emptyTypeManifest().value,
         isEnum: false,
       };
@@ -509,20 +512,21 @@ export function getTypeManifestVisitor(input: {
       const innerManifest = visit(node.type, self);
 
       // The Dart addEncoderSizePrefix / addDecoderSizePrefix APIs require
-      // Encoder<num> / Decoder<num> for the prefix. BigInt-width number types
-      // (u64, u128, i64, i128) return Encoder<BigInt> which is incompatible.
-      // When the IDL specifies such a prefix, substitute u32 which is wide
-      // enough for any realistic size prefix and satisfies the num constraint.
+      // Encoder<num> / Decoder<num> for the prefix, but BigInt-width number
+      // types (u64, u128, i64, i128) return Encoder<BigInt> which is
+      // incompatible. Transform the BigInt codec to int so it satisfies the
+      // num constraint while preserving the on-chain byte width (e.g. the
+      // system program's bincode u64 string-length prefix).
       const bigIntFormats = new Set(["u64", "u128", "i64", "i128"]);
       let prefixManifest;
       if (
         node.prefix.kind === "numberTypeNode" &&
         bigIntFormats.has((node.prefix as any).format)
       ) {
-        // Use u32 encoder/decoder instead of the oversized type.
+        const codecName = getNumberCodecName((node.prefix as any).format);
         prefixManifest = {
-          encoder: fragment`${use("getU32Encoder", "solanaCodecsNumbers")}()`,
-          decoder: fragment`${use("getU32Decoder", "solanaCodecsNumbers")}()`,
+          encoder: fragment`transformEncoder(${use(`get${codecName}Encoder`, "solanaCodecsNumbers")}(), (size) => BigInt.from(size))`,
+          decoder: fragment`transformDecoder(${use(`get${codecName}Decoder`, "solanaCodecsNumbers")}(), (size, _, __) => size.toInt())`,
         };
       } else {
         prefixManifest = visit(node.prefix, self);
@@ -757,7 +761,10 @@ function getNumberCodecExpression(
   return `get${name}${codecType}()`;
 }
 
-function getArraySizeExpression(node: ArrayTypeNode): string {
+function getArraySizeExpression(
+  node: ArrayTypeNode,
+  codecType: "Encoder" | "Decoder",
+): string {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -770,14 +777,17 @@ function getArraySizeExpression(node: ArrayTypeNode): string {
       if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
         return ""; // Default
       }
-      return `, size: PrefixedArraySize(get${getNumberCodecName(resolvedPrefix.format)}Encoder())`;
+      return `, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix.format, codecType)})`;
     }
     default:
       return "";
   }
 }
 
-function getMapSizeExpression(node: MapTypeNode): string {
+function getMapSizeExpression(
+  node: MapTypeNode,
+  codecType: "Encoder" | "Decoder",
+): string {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -790,14 +800,17 @@ function getMapSizeExpression(node: MapTypeNode): string {
       if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
         return "";
       }
-      return `, size: PrefixedArraySize(get${getNumberCodecName(resolvedPrefix.format)}Encoder())`;
+      return `, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix.format, codecType)})`;
     }
     default:
       return "";
   }
 }
 
-function getSetSizeExpression(node: SetTypeNode): string {
+function getSetSizeExpression(
+  node: SetTypeNode,
+  codecType: "Encoder" | "Decoder",
+): string {
   if (!("count" in node) || !node.count) return "";
   const count = node.count;
   switch (count.kind) {
@@ -810,7 +823,7 @@ function getSetSizeExpression(node: SetTypeNode): string {
       if (resolvedPrefix.format === "u32" && (!resolvedPrefix.endian || resolvedPrefix.endian === "le")) {
         return "";
       }
-      return `, size: PrefixedArraySize(get${getNumberCodecName(resolvedPrefix.format)}Encoder())`;
+      return `, size: PrefixedArraySize(${getNumberCodecExpression(resolvedPrefix.format, codecType)})`;
     }
     default:
       return "";

package/src/visitors/renderVisitor.ts

@@ -43,7 +43,7 @@ export function renderVisitor(
     // 3. Build a map of definedType module keys to their render map paths
     const typePathMap: Record<string, string> = {};
     for (const renderPath of renderMap.keys()) {
-      const match = renderPath.match(/^(?:.*\/)?types\/([a-z_]+)\.dart$/);
+      const match = renderPath.match(/^(?:.*\/)?types\/([a-z0-9_]+)\.dart$/);
       if (match) {
         typePathMap[`definedType:${match[1]}`] = renderPath;
       }
@@ -63,8 +63,12 @@ export function renderVisitor(
       const fileDir = dirname(filePath);
       const internalMap: Record<string, string> = {};
       for (const [key, typePath] of Object.entries(typePathMap)) {
-        // Don't import yourself
-        if (typePath === filePath) continue;
+        // Keep the key resolved without generating a self-import.
+        if (typePath === filePath) {
+          internalMap[key] = "";
+          continue;
+        }
+
         let rel = posix.relative(fileDir, typePath);
         if (!rel.startsWith(".")) {
           rel = `./${rel}`;