@codama/renderers-js 1.2.4 → 1.2.6

package/dist/index.node.mjs

@@ -1,6 +1,6 @@
-import { NodeStack, pipe, staticVisitor, extendVisitor, visit, findLastNodeFromPath, recordNodeStackVisitor, LinkableDictionary, getResolvedInstructionInputsVisitor, findProgramNodeFromPath, recordLinkablesOnFirstVisitVisitor, rootNodeVisitor, getLastNodeFromPath, deduplicateInstructionDependencies, findInstructionNodeFromPath } from '@codama/visitors-core';
+import { NodeStack, pipe, staticVisitor, extendVisitor, visit, findLastNodeFromPath, recordNodeStackVisitor, LinkableDictionary, getResolvedInstructionInputsVisitor, findProgramNodeFromPath, recordLinkablesOnFirstVisitVisitor, rootNodeVisitor, getLastNodeFromPath, findInstructionNodeFromPath, deduplicateInstructionDependencies } from '@codama/visitors-core';
 import { join, dirname } from 'node:path';
-import { REGISTERED_TYPE_NODE_KINDS, REGISTERED_VALUE_NODE_KINDS, resolveNestedTypeNode, isNode, camelCase, structTypeNode, structFieldTypeNode, isScalarEnum, structTypeNodeFromInstructionArgumentNodes, isNodeFilter, pascalCase, snakeCase, definedTypeNode, getAllInstructionsWithSubs, getAllPrograms, getAllPdas, getAllAccounts, getAllDefinedTypes, definedTypeLinkNode, VALUE_NODES, isDataEnum, capitalize, kebabCase, titleCase, accountValueNode, argumentValueNode, constantDiscriminatorNode, constantValueNodeFromBytes, constantValueNode, assertIsNode, getAllInstructionArguments } from '@codama/nodes';
+import { camelCase, pascalCase, snakeCase, REGISTERED_TYPE_NODE_KINDS, REGISTERED_VALUE_NODE_KINDS, isNodeFilter, resolveNestedTypeNode, structTypeNodeFromInstructionArgumentNodes, isNode, isScalarEnum, structTypeNode, structFieldTypeNode, titleCase, kebabCase, capitalize, getAllPrograms, getAllPdas, getAllAccounts, getAllInstructionsWithSubs, getAllDefinedTypes, definedTypeNode, definedTypeLinkNode, isDataEnum, accountValueNode, argumentValueNode, VALUE_NODES, getAllInstructionArguments, constantDiscriminatorNode, constantValueNodeFromBytes, constantValueNode, assertIsNode } from '@codama/nodes';
 import { getBase64Encoder, getBase58Encoder, getBase16Encoder, getUtf8Encoder, getBase64Decoder } from '@solana/codecs-strings';
 import { logWarn, CodamaError, CODAMA_ERROR__UNEXPECTED_NODE_KIND } from '@codama/errors';
 import { fileURLToPath } from 'node:url';
@@ -12,18 +12,18 @@ import { format } from 'prettier/standalone';
 
 // src/ImportMap.ts
 var DEFAULT_EXTERNAL_MODULE_MAP = {
-  solanaAccounts: "@solana/web3.js",
-  solanaAddresses: "@solana/web3.js",
-  solanaCodecsCore: "@solana/web3.js",
-  solanaCodecsDataStructures: "@solana/web3.js",
-  solanaCodecsNumbers: "@solana/web3.js",
-  solanaCodecsStrings: "@solana/web3.js",
-  solanaErrors: "@solana/web3.js",
-  solanaInstructions: "@solana/web3.js",
-  solanaOptions: "@solana/web3.js",
-  solanaPrograms: "@solana/web3.js",
-  solanaRpcTypes: "@solana/web3.js",
-  solanaSigners: "@solana/web3.js"
+  solanaAccounts: "@solana/kit",
+  solanaAddresses: "@solana/kit",
+  solanaCodecsCore: "@solana/kit",
+  solanaCodecsDataStructures: "@solana/kit",
+  solanaCodecsNumbers: "@solana/kit",
+  solanaCodecsStrings: "@solana/kit",
+  solanaErrors: "@solana/kit",
+  solanaInstructions: "@solana/kit",
+  solanaOptions: "@solana/kit",
+  solanaPrograms: "@solana/kit",
+  solanaRpcTypes: "@solana/kit",
+  solanaSigners: "@solana/kit"
 };
 var DEFAULT_GRANULAR_EXTERNAL_MODULE_MAP = {
   solanaAccounts: "@solana/accounts",
@@ -429,7 +429,7 @@ function getAccountPdaHelpersFragment(scope) {
   const { accountPath, nameApi, linkables, customAccountData, typeManifest: typeManifest2 } = scope;
   const accountNode = getLastNodeFromPath(accountPath);
   const programNode = findProgramNodeFromPath(accountPath);
-  const pdaNode = accountNode.pda ? linkables.get([...accountPath, accountNode.pda]) : undefined;
+  const pdaNode = accountNode.pda ? linkables.get([...accountPath, accountNode.pda]) : void 0;
   if (!pdaNode) {
     return fragment("");
   }
@@ -609,14 +609,14 @@ function getInstructionAccountMetaFragment(instructionAccountNode) {
   return fragment(`ReadonlyAccount<${typeParam}>`).addImports("solanaInstructions", "type ReadonlyAccount");
 }
 function getInstructionAccountTypeParamFragment(scope) {
-  const { instructionAccountPath, allowAccountMeta, linkables } = scope;
+  const { instructionAccountPath, linkables } = scope;
   const instructionAccountNode = getLastNodeFromPath(instructionAccountPath);
   const instructionNode = findInstructionNodeFromPath(instructionAccountPath);
   const programNode = findProgramNodeFromPath(instructionAccountPath);
   const typeParam = `TAccount${pascalCase(instructionAccountNode.name)}`;
-  const accountMeta = allowAccountMeta ? " | IAccountMeta<string>" : "";
+  const accountMeta = " | IAccountMeta<string>" ;
   const imports = new ImportMap();
-  if (allowAccountMeta) {
+  {
     imports.add("solanaInstructions", "type IAccountMeta");
   }
   if (instructionNode.optionalAccountStrategy === "omitted" && instructionAccountNode.isOptional) {
@@ -781,7 +781,7 @@ function getInstructionInputDefaultFragment(scope) {
     if (input.kind === "instructionAccountNode" && isNode(defaultValue, "resolverValueNode")) {
       return fragment(`accounts.${inputName} = { ...accounts.${inputName}, ...${renderedValue} };`);
     }
-    if (input.kind === "instructionAccountNode" && isWritable === undefined) {
+    if (input.kind === "instructionAccountNode" && isWritable === void 0) {
       return fragment(`accounts.${inputName}.value = ${renderedValue};`);
     }
     if (input.kind === "instructionAccountNode") {
@@ -967,7 +967,7 @@ ${ifTrueRenderer ? ifTrueRenderer.render : ifFalseRenderer?.render}
 }
 function renderNestedInstructionDefault(scope) {
   const { input, defaultValue } = scope;
-  if (!defaultValue) return undefined;
+  if (!defaultValue) return void 0;
   return getInstructionInputDefaultFragment({
     ...scope,
     input: { ...input, defaultValue }
@@ -1370,7 +1370,6 @@ function getInstructionTypeFragment(scope) {
     instructionNode.accounts.map(
       (account) => getInstructionAccountTypeParamFragment({
         ...scope,
-        allowAccountMeta: true,
         instructionAccountPath: [...instructionPath, account]
       })
     ),
@@ -2635,7 +2634,7 @@ function getRenderMapVisitor(options = {}) {
                 "type IAccountSignerMeta",
                 "isTransactionSigner",
                 "type TransactionSigner"
-              ]).addAlias("solanaSigners", "isTransactionSigner", "web3JsIsTransactionSigner").toString(dependencyMap, useGranularImports)
+              ]).addAlias("solanaSigners", "isTransactionSigner", "kitIsTransactionSigner").toString(dependencyMap, useGranularImports)
             })
           );
         }