@codama/renderers-js 2.0.0 → 2.0.1

package/dist/index.node.mjs

@@ -2293,10 +2293,14 @@ function getProgramPluginInstructionsTypeFragment(scope) {
     programNode.instructions.map((instruction) => {
       const name = nameApi.programPluginInstructionKey(instruction.name);
       const isAsync = asyncInstructions.includes(instruction.name);
-      const instructionType = use("type " + nameApi.instructionType(instruction.name), "generatedInstructions");
-      const instructionInputType = isAsync ? use("type " + nameApi.instructionAsyncInputType(instruction.name), "generatedInstructions") : use("type " + nameApi.instructionSyncInputType(instruction.name), "generatedInstructions");
-      const instructionTypeWithPromise = isAsync ? fragment`Promise<${instructionType}>` : instructionType;
-      return fragment`${name}: (input: ${instructionInputType}) => ${instructionTypeWithPromise} & ${selfPlanAndSendFunctions};`;
+      let instructionInputType = isAsync ? use("type " + nameApi.instructionAsyncInputType(instruction.name), "generatedInstructions") : use("type " + nameApi.instructionSyncInputType(instruction.name), "generatedInstructions");
+      const instructionFunction = isAsync ? use("type " + nameApi.instructionAsyncFunction(instruction.name), "generatedInstructions") : use("type " + nameApi.instructionSyncFunction(instruction.name), "generatedInstructions");
+      const payerDefaultValues = getPayerDefaultValues(instruction);
+      if (payerDefaultValues.length > 0) {
+        const fieldStringUnion = payerDefaultValues.map(({ name: name2 }) => `"${name2}"`).join(" | ");
+        instructionInputType = fragment`MakeOptional<${instructionInputType}, ${fieldStringUnion}>`;
+      }
+      return fragment`${name}: (input: ${instructionInputType}) => ReturnType<typeof ${instructionFunction}> & ${selfPlanAndSendFunctions};`;
     }),
     (c) => c.join(" ")
   );
@@ -2314,7 +2318,7 @@ function getProgramPluginRequirementsTypeFragment(scope) {
   const requirements = mergeFragments(
     [
       hasAccounts ? clientWithRpc : void 0,
-      hasNonOptionalPayerDefaultValueInputs(programNode) ? clientWithPayer : void 0,
+      hasPayerDefaultValues(programNode) ? clientWithPayer : void 0,
       hasInstructions ? clientWithTransactionPlanning : void 0,
       hasInstructions ? clientWithTransactionSending : void 0
     ],
@@ -2334,7 +2338,7 @@ function getProgramPluginFunctionFragment(scope) {
   );
   return fragment`export function ${programPluginFunction}() {
     return <T extends ${programPluginRequirementsType}>(client: T) => {
-        return { ...client, ${programPluginKey}: { ${fields}} as ${programPluginType} };
+        return { ...client, ${programPluginKey}: <${programPluginType}>{ ${fields} } };
     };
 }`;
 }
@@ -2359,40 +2363,40 @@ function getProgramPluginInstructionsObjectFragment(scope) {
     programNode.instructions.map((instruction) => {
       const name = nameApi.programPluginInstructionKey(instruction.name);
       const isAsync = asyncInstructions.includes(instruction.name);
-      const instructionInputType = isAsync ? use("type " + nameApi.instructionAsyncInputType(instruction.name), "generatedInstructions") : use("type " + nameApi.instructionSyncInputType(instruction.name), "generatedInstructions");
       const instructionFunction = isAsync ? use(nameApi.instructionAsyncFunction(instruction.name), "generatedInstructions") : use(nameApi.instructionSyncFunction(instruction.name), "generatedInstructions");
       const addSelfPlanAndSendFunctions = use("addSelfPlanAndSendFunctions", "solanaProgramClientCore");
-      const inputWithDefaultPayerValues = getNonOptionalPayerDefaultValueInputs(instruction);
-      if (inputWithDefaultPayerValues.length === 0) {
-        return fragment`${name}: (input: ${instructionInputType}) => ${addSelfPlanAndSendFunctions}(client, ${instructionFunction}(input))`;
+      const payerDefaultValues = getPayerDefaultValues(instruction);
+      let input = fragment`input`;
+      if (payerDefaultValues.length > 0) {
+        const fieldOverrides = mergeFragments(
+          payerDefaultValues.map(({ name: name2, signer }) => {
+            const signerDefault = signer ? "client.payer" : "client.payer.address";
+            return fragment`${name2}: input.${name2} ?? ${signerDefault}`;
+          }),
+          (c) => c.join(", ")
+        );
+        input = fragment`{ ...input, ${fieldOverrides} }`;
       }
-      const renamedArgs = getRenamedArgsMap(instruction);
-      const processedInputWithDefaultPayerValues = inputWithDefaultPayerValues.map((inputNode) => {
-        return isNode(inputNode, "instructionAccountNode") ? { name: inputNode.name, signer: inputNode.isSigner !== false } : { name: renamedArgs.get(inputNode.name) ?? inputNode.name, signer: false };
-      });
-      const fieldStringUnion = processedInputWithDefaultPayerValues.map(({ name: name2 }) => `"${name2}"`).join(" | ");
-      const instructionInputTypeWithPayer = fragment`MakeOptional<${instructionInputType}, ${fieldStringUnion}>`;
-      const fieldOverrides = mergeFragments(
-        processedInputWithDefaultPayerValues.map(
-          ({ name: name2, signer }) => fragment`${name2}: input.${name2} ?? ${signer ? "client.payer" : "client.payer.address"}`
-        ),
-        (c) => c.join(", ")
-      );
-      const inputWithPayer = fragment`{ ...input, ${fieldOverrides} }`;
-      return fragment`${name}: (input: ${instructionInputTypeWithPayer}) => ${addSelfPlanAndSendFunctions}(client, ${instructionFunction}(${inputWithPayer}))`;
+      return fragment`${name}: input => ${addSelfPlanAndSendFunctions}(client, ${instructionFunction}(${input}))`;
     }),
     (c) => c.join(", ")
   );
   return fragment`instructions: { ${fields} }`;
 }
 function getMakeOptionalHelperTypeFragment(scope) {
-  if (!hasNonOptionalPayerDefaultValueInputs(scope.programNode)) return;
+  if (!hasPayerDefaultValues(scope.programNode)) return;
   return fragment`type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;`;
 }
-function hasNonOptionalPayerDefaultValueInputs(programNode) {
-  return programNode.instructions.some((instruction) => getNonOptionalPayerDefaultValueInputs(instruction).length > 0);
+function hasPayerDefaultValues(programNode) {
+  return programNode.instructions.some((instruction) => getPayerDefaultValueNodes(instruction).length > 0);
+}
+function getPayerDefaultValues(instructionNode) {
+  const renamedArgs = getRenamedArgsMap(instructionNode);
+  return getPayerDefaultValueNodes(instructionNode).map((inputNode) => {
+    return isNode(inputNode, "instructionAccountNode") ? { name: inputNode.name, signer: inputNode.isSigner !== false } : { name: renamedArgs.get(inputNode.name) ?? inputNode.name, signer: false };
+  });
 }
-function getNonOptionalPayerDefaultValueInputs(instructionNode) {
+function getPayerDefaultValueNodes(instructionNode) {
   return [
     ...instructionNode.accounts.filter((a) => !a.isOptional && isNode(a.defaultValue, "payerValueNode")),
     ...instructionNode.arguments.filter((a) => isNode(a.defaultValue, "payerValueNode"))