@codama/renderers-js 1.2.14 → 1.3.1

package/dist/index.node.cjs

@@ -552,43 +552,49 @@ function getTypeFragment(scope) {
 // src/fragments/typeDecoder.ts
 function getTypeDecoderFragment(scope) {
   const { name, manifest, nameApi, docs = [] } = scope;
+  const decoderType = typeof scope.size === "number" ? "FixedSizeDecoder" : "Decoder";
   return fragmentFromTemplate("typeDecoder.njk", {
     decoderFunction: nameApi.decoderFunction(name),
+    decoderType,
     docs,
     looseName: nameApi.dataArgsType(name),
     manifest,
     strictName: nameApi.dataType(name)
-  }).mergeImportsWith(manifest.decoder).addImports("solanaCodecsCore", "type Decoder");
+  }).mergeImportsWith(manifest.decoder).addImports("solanaCodecsCore", `type ${decoderType}`);
 }
 
 // src/fragments/typeEncoder.ts
 function getTypeEncoderFragment(scope) {
   const { name, manifest, nameApi, docs = [] } = scope;
+  const encoderType = typeof scope.size === "number" ? "FixedSizeEncoder" : "Encoder";
   return fragmentFromTemplate("typeEncoder.njk", {
     docs,
     encoderFunction: nameApi.encoderFunction(name),
+    encoderType,
     looseName: nameApi.dataArgsType(name),
     manifest,
     strictName: nameApi.dataType(name)
-  }).mergeImportsWith(manifest.encoder).addImports("solanaCodecsCore", "type Encoder");
+  }).mergeImportsWith(manifest.encoder).addImports("solanaCodecsCore", `type ${encoderType}`);
 }
 
 // src/fragments/typeCodec.ts
 function getTypeCodecFragment(scope) {
   const { name, manifest, nameApi } = scope;
+  const codecType = typeof scope.size === "number" ? "FixedSizeCodec" : "Codec";
   return mergeFragments(
     [
       getTypeEncoderFragment({ ...scope, docs: scope.encoderDocs }),
       getTypeDecoderFragment({ ...scope, docs: scope.decoderDocs }),
       fragmentFromTemplate("typeCodec.njk", {
         codecFunction: nameApi.codecFunction(name),
+        codecType,
         decoderFunction: nameApi.decoderFunction(name),
         docs: scope.codecDocs,
         encoderFunction: nameApi.encoderFunction(name),
         looseName: nameApi.dataArgsType(name),
         manifest,
         strictName: nameApi.dataType(name)
-      }).addImports("solanaCodecsCore", ["type Codec", "combineCodec"])
+      }).addImports("solanaCodecsCore", [`type ${codecType}`, "combineCodec"])
     ],
     (renders) => renders.join("\n\n")
   );
@@ -612,7 +618,8 @@ function getAccountTypeFragment(scope) {
   return getTypeWithCodecFragment({
     manifest: typeManifest2,
     name: accountNode.name,
-    nameApi
+    nameApi,
+    size: scope.size
   });
 }
 
@@ -673,10 +680,10 @@ var import_nodes6 = require("@codama/nodes");
 function getInstructionAccountMetaFragment(instructionAccountNode) {
   const typeParam = `TAccount${(0, import_nodes6.pascalCase)(instructionAccountNode.name)}`;
   if (instructionAccountNode.isSigner === true && instructionAccountNode.isWritable) {
-    return fragment(`WritableSignerAccount<${typeParam}> & IAccountSignerMeta<${typeParam}>`).addImports("solanaInstructions", ["type WritableSignerAccount"]).addImports("solanaSigners", ["type IAccountSignerMeta"]);
+    return fragment(`WritableSignerAccount<${typeParam}> & AccountSignerMeta<${typeParam}>`).addImports("solanaInstructions", ["type WritableSignerAccount"]).addImports("solanaSigners", ["type AccountSignerMeta"]);
   }
   if (instructionAccountNode.isSigner === true) {
-    return fragment(`ReadonlySignerAccount<${typeParam}> & IAccountSignerMeta<${typeParam}>`).addImports("solanaInstructions", ["type ReadonlySignerAccount"]).addImports("solanaSigners", ["type IAccountSignerMeta"]);
+    return fragment(`ReadonlySignerAccount<${typeParam}> & AccountSignerMeta<${typeParam}>`).addImports("solanaInstructions", ["type ReadonlySignerAccount"]).addImports("solanaSigners", ["type AccountSignerMeta"]);
   }
   if (instructionAccountNode.isWritable) {
     return fragment(`WritableAccount<${typeParam}>`).addImports("solanaInstructions", "type WritableAccount");
@@ -693,10 +700,10 @@ function getInstructionAccountTypeParamFragment(scope) {
   const instructionNode = (0, import_visitors_core7.findInstructionNodeFromPath)(instructionAccountPath);
   const programNode = (0, import_visitors_core7.findProgramNodeFromPath)(instructionAccountPath);
   const typeParam = `TAccount${(0, import_nodes7.pascalCase)(instructionAccountNode.name)}`;
-  const accountMeta = allowAccountMeta ? " | IAccountMeta<string>" : "";
+  const accountMeta = allowAccountMeta ? " | AccountMeta<string>" : "";
   const imports = new ImportMap();
   if (allowAccountMeta) {
-    imports.add("solanaInstructions", "type IAccountMeta");
+    imports.add("solanaInstructions", "type AccountMeta");
   }
   if (instructionNode.optionalAccountStrategy === "omitted" && instructionAccountNode.isOptional) {
     return fragment(`${typeParam} extends string${accountMeta} | undefined = undefined`, imports);
@@ -791,7 +798,8 @@ function getInstructionDataFragment(scope) {
   return getTypeWithCodecFragment({
     manifest: dataArgsManifest,
     name: instructionDataName,
-    nameApi
+    nameApi,
+    size: scope.size
   });
 }
 
@@ -1240,8 +1248,8 @@ function getInstructionRemainingAccountsFragment(scope) {
   return mergeFragments(
     fragments,
     (r) => `// Remaining accounts.
-const remainingAccounts: IAccountMeta[] = ${r.length === 1 ? r[0] : `[...${r.join(", ...")}]`}`
-  ).addImports("solanaInstructions", ["type IAccountMeta"]);
+const remainingAccounts: AccountMeta[] = ${r.length === 1 ? r[0] : `[...${r.join(", ...")}]`}`
+  ).addImports("solanaInstructions", ["type AccountMeta"]);
 }
 function getRemainingAccountsFragment2(remainingAccounts, scope) {
   const remainingAccountsFragment = (() => {
@@ -1361,7 +1369,7 @@ function getInstructionFunctionFragment(scope) {
   const getReturnType = (instructionType) => {
     let returnType = instructionType;
     if (hasByteDeltas) {
-      returnType = `${returnType} & IInstructionWithByteDelta`;
+      returnType = `${returnType} & InstructionWithByteDelta`;
     }
     return useAsync ? `Promise<${returnType}>` : returnType;
   };
@@ -1398,10 +1406,10 @@ function getInstructionFunctionFragment(scope) {
     argsTypeFragment
   ).addImports("generatedPrograms", [programAddressConstant]).addImports("solanaAddresses", ["type Address"]);
   if (hasAccounts) {
-    functionFragment.addImports("solanaInstructions", ["type IAccountMeta"]).addImports("shared", ["getAccountMetaFactory", "type ResolvedAccount"]);
+    functionFragment.addImports("solanaInstructions", ["type AccountMeta"]).addImports("shared", ["getAccountMetaFactory", "type ResolvedAccount"]);
   }
   if (hasByteDeltas) {
-    functionFragment.addImports("shared", ["type IInstructionWithByteDelta"]);
+    functionFragment.addImports("shared", ["type InstructionWithByteDelta"]);
   }
   return functionFragment;
 }
@@ -1421,8 +1429,8 @@ function getInstructionType(scope) {
     if (account.isSigner === "either") {
       const signerRole = account.isWritable ? "WritableSignerAccount" : "ReadonlySignerAccount";
       return fragment(
-        `typeof input["${camelName}"] extends TransactionSigner<${typeParam}> ? ${signerRole}<${typeParam}> & IAccountSignerMeta<${typeParam}> : ${typeParam}`
-      ).addImports("solanaInstructions", [`type ${signerRole}`]).addImports("solanaSigners", ["type IAccountSignerMeta"]);
+        `typeof input["${camelName}"] extends TransactionSigner<${typeParam}> ? ${signerRole}<${typeParam}> & AccountSignerMeta<${typeParam}> : ${typeParam}`
+      ).addImports("solanaInstructions", [`type ${signerRole}`]).addImports("solanaSigners", ["type AccountSignerMeta"]);
     }
     return fragment(typeParam);
   });
@@ -1471,7 +1479,7 @@ function getInstructionParseFunctionFragment(scope) {
     instructionParsedType: nameApi.instructionParsedType(instructionNode.name),
     minimumNumberOfAccounts,
     programAddressConstant
-  }).mergeImportsWith(dataTypeFragment).addImports("generatedPrograms", [programAddressConstant]).addImports("solanaInstructions", ["type IInstruction"]).addImports("solanaInstructions", hasAccounts ? ["type IInstructionWithAccounts", "type IAccountMeta"] : []).addImports("solanaInstructions", hasData ? ["type IInstructionWithData"] : []);
+  }).mergeImportsWith(dataTypeFragment).addImports("generatedPrograms", [programAddressConstant]).addImports("solanaInstructions", ["type Instruction"]).addImports("solanaInstructions", hasAccounts ? ["type InstructionWithAccounts", "type AccountMeta"] : []).addImports("solanaInstructions", hasData ? ["type InstructionWithData"] : []).addImports("solanaCodecsCore", hasData ? ["type ReadonlyUint8Array"] : []);
 }
 
 // src/fragments/instructionType.ts
@@ -1519,11 +1527,11 @@ function getInstructionTypeFragment(scope) {
     instruction: instructionNode,
     instructionType: nameApi.instructionType(instructionNode.name),
     programAddressConstant
-  }).mergeImportsWith(accountTypeParamsFragment, accountMetasFragment).addImports("generatedPrograms", [programAddressConstant]).addImports("solanaInstructions", [
-    "type IAccountMeta",
-    "type IInstruction",
-    "type IInstructionWithAccounts",
-    ...hasData ? ["type IInstructionWithData"] : []
+  }).mergeImportsWith(accountTypeParamsFragment, accountMetasFragment).addImports("generatedPrograms", [programAddressConstant]).addImports("solanaCodecsCore", hasData ? ["type ReadonlyUint8Array"] : []).addImports("solanaInstructions", [
+    "type AccountMeta",
+    "type Instruction",
+    "type InstructionWithAccounts",
+    ...hasData ? ["type InstructionWithData"] : []
   ]);
   return fragment2;
 }
@@ -2541,6 +2549,7 @@ function getRenderMapVisitor(options = {}) {
     stack
   });
   const resolvedInstructionInputVisitor = (0, import_visitors_core21.getResolvedInstructionInputsVisitor)();
+  const byteSizeVisitor = (0, import_visitors_core21.getByteSizeVisitor)(linkables, { stack });
   const globalScope = {
     asyncResolvers,
     customAccountData,
@@ -2568,6 +2577,7 @@ function getRenderMapVisitor(options = {}) {
         const scope = {
           ...globalScope,
           accountPath,
+          size: (0, import_visitors_core21.visit)(node, byteSizeVisitor),
           typeManifest: (0, import_visitors_core21.visit)(node, typeManifestVisitor)
         };
         const fields = (0, import_nodes22.resolveNestedTypeNode)(node.data).fields;
@@ -2608,6 +2618,7 @@ function getRenderMapVisitor(options = {}) {
           encoderDocs: [],
           manifest: (0, import_visitors_core21.visit)(node, typeManifestVisitor),
           name: node.name,
+          size: (0, import_visitors_core21.visit)(node, byteSizeVisitor),
           typeDocs: node.docs,
           typeNode: node.type
         };
@@ -2650,7 +2661,8 @@ function getRenderMapVisitor(options = {}) {
           ),
           instructionPath,
           renamedArgs: getRenamedArgsMap(node),
-          resolvedInputs: (0, import_visitors_core21.visit)(node, resolvedInstructionInputVisitor)
+          resolvedInputs: (0, import_visitors_core21.visit)(node, resolvedInstructionInputVisitor),
+          size: (0, import_visitors_core21.visit)(node, byteSizeVisitor)
         };
         const instructionDiscriminatorConstantsFragment = getDiscriminatorConstantsFragment({
           ...scope,
@@ -2779,10 +2791,10 @@ function getRenderMapVisitor(options = {}) {
                 "type ProgramDerivedAddress"
               ]).add("solanaInstructions", [
                 "AccountRole",
-                "type IAccountMeta",
+                "type AccountMeta",
                 "upgradeRoleToSigner"
               ]).add("solanaSigners", [
-                "type IAccountSignerMeta",
+                "type AccountSignerMeta",
                 "isTransactionSigner",
                 "type TransactionSigner"
               ]).addAlias("solanaSigners", "isTransactionSigner", "kitIsTransactionSigner").toString(dependencyMap, useGranularImports)