@algorandfoundation/algokit-client-generator 6.0.1 → 7.0.0-alpha.1

package/{client → src/client}/call-composer-types.js

@@ -1,21 +1,19 @@
 'use strict';
 
 var writer = require('../output/writer.js');
-var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
-var deployTypes = require('./deploy-types.js');
-var algosdk = require('algosdk');
+var appClientContext = require('./app-client-context.js');
 
 function* callComposerType(ctx) {
-    const { name, callConfig, app } = ctx;
+    const { name, app } = ctx;
     yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`;
     yield writer.IncIndent;
     yield* callComposerTypeNoops(ctx);
     if (ctx.mode === 'full') {
-        yield* callComposerOperationMethodType(ctx, `Updates an existing instance of the ${app.name} smart contract`, callConfig.updateMethods, 'update');
-        yield* callComposerOperationMethodType(ctx, `Deletes an existing instance of the ${app.name} smart contract`, callConfig.deleteMethods, 'delete');
+        yield* callComposerOperationMethodType(ctx, `Updates an existing instance of the ${app.name} smart contract`, app.updateMethods, 'update');
+        yield* callComposerOperationMethodType(ctx, `Deletes an existing instance of the ${app.name} smart contract`, app.deleteMethods, 'delete');
     }
-    yield* callComposerOperationMethodType(ctx, `Opts the user into an existing instance of the ${app.name} smart contract`, callConfig.optInMethods, 'optIn');
-    yield* callComposerOperationMethodType(ctx, `Makes a close out call to an existing instance of the ${app.name} smart contract`, callConfig.closeOutMethods, 'closeOut');
+    yield* callComposerOperationMethodType(ctx, `Opts the user into an existing instance of the ${app.name} smart contract`, app.optInMethods, 'optIn');
+    yield* callComposerOperationMethodType(ctx, `Makes a close out call to an existing instance of the ${app.name} smart contract`, app.closeOutMethods, 'closeOut');
     yield* callComposerTypeClearState(ctx);
     yield* writer.jsDoc({
         description: 'Adds a transaction to the composer',
@@ -32,16 +30,16 @@ function* callComposerType(ctx) {
     yield* writer.jsDoc({
         description: 'Simulates the transaction group and returns the result',
     });
-    yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
-    yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
-    yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
+    yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
+    yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
+    yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
     yield* writer.jsDoc({
         description: 'Sends the transaction group to the network and returns the results',
     });
     yield `send(params?: SendParams): Promise<${name}ComposerResults<TReturns>>`;
     yield writer.DecIndentAndCloseBlock;
     yield `
-  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendAtomicTransactionComposerResults & {
+  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendTransactionComposerResults & {
     returns: TReturns
   }>
   `;
@@ -50,63 +48,62 @@ function* callComposerTypeClearState({ app, name }) {
     yield* writer.jsDoc({
         description: `Makes a clear_state call to an existing instance of the ${app.name} smart contract.`,
         params: {
-            args: `The arguments for the bare call`,
+            params: `Any additional parameters for the bare call`,
         },
         returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
     });
     yield `clearState(params?: AppClientBareCallParams): ${name}Composer<[...TReturns, undefined]>`;
     yield writer.NewLine;
 }
-function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
-    for (const method of app.methods) {
-        const methodSig = new algosdk.ABIMethod(method).getSignature();
-        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
-        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSig]);
-        // Skip methods which don't support a no_op call config
-        if (!callConfig.callMethods.includes(methodSig))
+function* callComposerTypeNoops({ app, name, sanitizer }) {
+    for (const method of app.noOpMethods) {
+        if (!appClientContext.isAbiMethod(method))
             continue;
+        const methodSig = method.signature;
+        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+        const methodName = method.uniqueName.makeSafeMethodIdentifier;
         yield* writer.jsDoc({
-            description: `Calls the ${new algosdk.ABIMethod(method).getSignature()} ABI method.`,
+            description: `Calls the ${methodSig} ABI method.`,
             abiDescription: method.desc,
             params: {
-                args: `The arguments for the contract call`,
                 params: `Any additional parameters for the call`,
             },
             returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
         });
-        yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]>`;
+        const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`;
+        yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<${updatedReturnType}>`;
         yield writer.NewLine;
     }
 }
-function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name, sanitizer }, description, methods, verb, includeCompilation) {
+function* callComposerOperationMethodType({ name, sanitizer }, description, methods, verb, includeCompilation) {
     if (methods.length) {
         yield* writer.jsDoc(`Gets available ${verb} methods`);
         yield `readonly ${verb}: {`;
         yield writer.IncIndent;
-        for (const methodSig of methods) {
-            const onComplete = verb === 'create' ? deployTypes.getCreateOnCompleteOptions(methodSig, app) : undefined;
-            if (methodSig === getCallConfigSummary.BARE_CALL) {
+        for (const method of methods) {
+            const onComplete = verb === 'create' ? method.createActions.inputType : undefined;
+            if (!appClientContext.isAbiMethod(method)) {
                 yield* writer.jsDoc({
                     description: `${description} using a bare call.`,
                     params: {
-                        args: `The arguments for the bare call`,
+                        params: `Any additional parameters for the call`,
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${''}): ${name}Composer<[...TReturns, undefined]>`;
+                yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${''}): ${name}Composer<TReturns>`;
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[methodSig];
+                const uniqueName = method.uniqueName.original;
                 yield* writer.jsDoc({
-                    description: `${description} using the ${methodSig} ABI method.`,
+                    description: `${description} using the ${method.signature} ABI method.`,
                     params: {
-                        args: `The arguments for the smart contract call`,
                         params: `Any additional parameters for the call`,
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
-                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${onComplete?.isOptional !== false ? '?' : ''}: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]>`;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
+                const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`;
+                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${onComplete?.isOptional !== false ? '?' : ''}: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${''}${onComplete?.typeLiteral ? ` & ${onComplete.typeLiteral}` : ''}): ${name}Composer<${updatedReturnType}>`;
             }
         }
         yield writer.DecIndentAndCloseBlock;

package/src/client/call-composer-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer-types.js","sources":["../../../src/client/call-composer-types.ts"],"sourcesContent":["import { DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\n\nimport { AppClientMethodContext, isAbiMethod } from './app-client-context'\n\nexport function* callComposerType(ctx: GeneratorContext): DocumentParts {\n  const { name, app } = ctx\n  yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`\n  yield IncIndent\n\n  yield* callComposerTypeNoops(ctx)\n  if (ctx.mode === 'full') {\n    yield* callComposerOperationMethodType(\n      ctx,\n      `Updates an existing instance of the ${app.name} smart contract`,\n      app.updateMethods,\n      'update',\n    )\n    yield* callComposerOperationMethodType(\n      ctx,\n      `Deletes an existing instance of the ${app.name} smart contract`,\n      app.deleteMethods,\n      'delete',\n    )\n  }\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Opts the user into an existing instance of the ${app.name} smart contract`,\n    app.optInMethods,\n    'optIn',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Makes a close out call to an existing instance of the ${app.name} smart contract`,\n    app.closeOutMethods,\n    'closeOut',\n  )\n\n  yield* callComposerTypeClearState(ctx)\n\n  yield* jsDoc({\n    description: 'Adds a transaction to the composer',\n    params: {\n      txn: 'A transaction to add to the transaction group',\n      signer: 'The optional signer to use when signing this transaction.',\n    },\n  })\n  yield `addTransaction(txn: Transaction, signer?: TransactionSigner): ${name}Composer<TReturns>`\n\n  yield* jsDoc({\n    description: 'Returns the underlying AtomicTransactionComposer instance',\n  })\n  yield `composer(): Promise<TransactionComposer>`\n\n  yield* jsDoc({\n    description: 'Simulates the transaction group and returns the result',\n  })\n  yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n  yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n  yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n\n  yield* jsDoc({\n    description: 'Sends the transaction group to the network and returns the results',\n  })\n  yield `send(params?: SendParams): Promise<${name}ComposerResults<TReturns>>`\n\n  yield DecIndentAndCloseBlock\n\n  yield `\n  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendTransactionComposerResults & {\n    returns: TReturns\n  }>\n  `\n}\n\nfunction* callComposerTypeClearState({ app, name }: GeneratorContext): DocumentParts {\n  yield* jsDoc({\n    description: `Makes a clear_state call to an existing instance of the ${app.name} smart contract.`,\n    params: {\n      params: `Any additional parameters for the bare call`,\n    },\n    returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n  })\n  yield `clearState(params?: AppClientBareCallParams): ${name}Composer<[...TReturns, undefined]>`\n  yield NewLine\n}\n\nfunction* callComposerTypeNoops({ app, name, sanitizer }: GeneratorContext): DocumentParts {\n  for (const method of app.noOpMethods) {\n    if (!isAbiMethod(method)) continue\n    const methodSig = method.signature\n    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\n    const methodName = method.uniqueName.makeSafeMethodIdentifier\n\n    yield* jsDoc({\n      description: `Calls the ${methodSig} ABI method.`,\n      abiDescription: method.desc,\n      params: {\n        params: `Any additional parameters for the call`,\n      },\n      returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n    })\n    const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`\n    yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<${updatedReturnType}>`\n    yield NewLine\n  }\n}\n\nfunction* callComposerOperationMethodType(\n  { name, sanitizer }: GeneratorContext,\n  description: string,\n  methods: AppClientMethodContext[],\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\n    yield `readonly ${verb}: {`\n    yield IncIndent\n    for (const method of methods) {\n      const onComplete = verb === 'create' ? method.createActions.inputType : undefined\n      if (!isAbiMethod(method)) {\n        yield* jsDoc({\n          description: `${description} using a bare call.`,\n          params: {\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${\n          includeCompilation ? '& AppClientCompilationParams' : ''\n        }): ${name}Composer<TReturns>`\n      } else {\n        const uniqueName = method.uniqueName.original\n        yield* jsDoc({\n          description: `${description} using the ${method.signature} ABI method.`,\n          params: {\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n\n        const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`\n        yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${\n          onComplete?.isOptional !== false ? '?' : ''\n        }: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n          onComplete?.typeLiteral ? ` & ${onComplete.typeLiteral}` : ''\n        }): ${name}Composer<${updatedReturnType}>`\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n"],"names":["IncIndent","jsDoc","DecIndentAndCloseBlock","NewLine","isAbiMethod"],"mappings":"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"}

package/{client → src/client}/call-composer-types.mjs

@@ -1,19 +1,17 @@
 import { IncIndent, jsDoc, DecIndentAndCloseBlock, NewLine } from '../output/writer.mjs';
-import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
-import { getCreateOnCompleteOptions } from './deploy-types.mjs';
-import { ABIMethod } from 'algosdk';
+import { isAbiMethod } from './app-client-context.mjs';
 
 function* callComposerType(ctx) {
-    const { name, callConfig, app } = ctx;
+    const { name, app } = ctx;
     yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`;
     yield IncIndent;
     yield* callComposerTypeNoops(ctx);
     if (ctx.mode === 'full') {
-        yield* callComposerOperationMethodType(ctx, `Updates an existing instance of the ${app.name} smart contract`, callConfig.updateMethods, 'update');
-        yield* callComposerOperationMethodType(ctx, `Deletes an existing instance of the ${app.name} smart contract`, callConfig.deleteMethods, 'delete');
+        yield* callComposerOperationMethodType(ctx, `Updates an existing instance of the ${app.name} smart contract`, app.updateMethods, 'update');
+        yield* callComposerOperationMethodType(ctx, `Deletes an existing instance of the ${app.name} smart contract`, app.deleteMethods, 'delete');
     }
-    yield* callComposerOperationMethodType(ctx, `Opts the user into an existing instance of the ${app.name} smart contract`, callConfig.optInMethods, 'optIn');
-    yield* callComposerOperationMethodType(ctx, `Makes a close out call to an existing instance of the ${app.name} smart contract`, callConfig.closeOutMethods, 'closeOut');
+    yield* callComposerOperationMethodType(ctx, `Opts the user into an existing instance of the ${app.name} smart contract`, app.optInMethods, 'optIn');
+    yield* callComposerOperationMethodType(ctx, `Makes a close out call to an existing instance of the ${app.name} smart contract`, app.closeOutMethods, 'closeOut');
     yield* callComposerTypeClearState(ctx);
     yield* jsDoc({
         description: 'Adds a transaction to the composer',
@@ -30,16 +28,16 @@ function* callComposerType(ctx) {
     yield* jsDoc({
         description: 'Simulates the transaction group and returns the result',
     });
-    yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
-    yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
-    yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: modelsv2.SimulateResponse }>`;
+    yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
+    yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
+    yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`;
     yield* jsDoc({
         description: 'Sends the transaction group to the network and returns the results',
     });
     yield `send(params?: SendParams): Promise<${name}ComposerResults<TReturns>>`;
     yield DecIndentAndCloseBlock;
     yield `
-  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendAtomicTransactionComposerResults & {
+  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendTransactionComposerResults & {
     returns: TReturns
   }>
   `;
@@ -48,63 +46,62 @@ function* callComposerTypeClearState({ app, name }) {
     yield* jsDoc({
         description: `Makes a clear_state call to an existing instance of the ${app.name} smart contract.`,
         params: {
-            args: `The arguments for the bare call`,
+            params: `Any additional parameters for the bare call`,
         },
         returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
     });
     yield `clearState(params?: AppClientBareCallParams): ${name}Composer<[...TReturns, undefined]>`;
     yield NewLine;
 }
-function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
-    for (const method of app.methods) {
-        const methodSig = new ABIMethod(method).getSignature();
-        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
-        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSig]);
-        // Skip methods which don't support a no_op call config
-        if (!callConfig.callMethods.includes(methodSig))
+function* callComposerTypeNoops({ app, name, sanitizer }) {
+    for (const method of app.noOpMethods) {
+        if (!isAbiMethod(method))
             continue;
+        const methodSig = method.signature;
+        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+        const methodName = method.uniqueName.makeSafeMethodIdentifier;
         yield* jsDoc({
-            description: `Calls the ${new ABIMethod(method).getSignature()} ABI method.`,
+            description: `Calls the ${methodSig} ABI method.`,
             abiDescription: method.desc,
             params: {
-                args: `The arguments for the contract call`,
                 params: `Any additional parameters for the call`,
             },
             returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
         });
-        yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]>`;
+        const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`;
+        yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<${updatedReturnType}>`;
         yield NewLine;
     }
 }
-function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name, sanitizer }, description, methods, verb, includeCompilation) {
+function* callComposerOperationMethodType({ name, sanitizer }, description, methods, verb, includeCompilation) {
     if (methods.length) {
         yield* jsDoc(`Gets available ${verb} methods`);
         yield `readonly ${verb}: {`;
         yield IncIndent;
-        for (const methodSig of methods) {
-            const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined;
-            if (methodSig === BARE_CALL) {
+        for (const method of methods) {
+            const onComplete = verb === 'create' ? method.createActions.inputType : undefined;
+            if (!isAbiMethod(method)) {
                 yield* jsDoc({
                     description: `${description} using a bare call.`,
                     params: {
-                        args: `The arguments for the bare call`,
+                        params: `Any additional parameters for the call`,
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${''}): ${name}Composer<[...TReturns, undefined]>`;
+                yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${''}): ${name}Composer<TReturns>`;
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[methodSig];
+                const uniqueName = method.uniqueName.original;
                 yield* jsDoc({
-                    description: `${description} using the ${methodSig} ABI method.`,
+                    description: `${description} using the ${method.signature} ABI method.`,
                     params: {
-                        args: `The arguments for the smart contract call`,
                         params: `Any additional parameters for the call`,
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
-                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${onComplete?.isOptional !== false ? '?' : ''}: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]>`;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
+                const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`;
+                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${onComplete?.isOptional !== false ? '?' : ''}: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${''}${onComplete?.typeLiteral ? ` & ${onComplete.typeLiteral}` : ''}): ${name}Composer<${updatedReturnType}>`;
             }
         }
         yield DecIndentAndCloseBlock;

package/src/client/call-composer-types.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer-types.mjs","sources":["../../../src/client/call-composer-types.ts"],"sourcesContent":["import { DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\n\nimport { AppClientMethodContext, isAbiMethod } from './app-client-context'\n\nexport function* callComposerType(ctx: GeneratorContext): DocumentParts {\n  const { name, app } = ctx\n  yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`\n  yield IncIndent\n\n  yield* callComposerTypeNoops(ctx)\n  if (ctx.mode === 'full') {\n    yield* callComposerOperationMethodType(\n      ctx,\n      `Updates an existing instance of the ${app.name} smart contract`,\n      app.updateMethods,\n      'update',\n    )\n    yield* callComposerOperationMethodType(\n      ctx,\n      `Deletes an existing instance of the ${app.name} smart contract`,\n      app.deleteMethods,\n      'delete',\n    )\n  }\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Opts the user into an existing instance of the ${app.name} smart contract`,\n    app.optInMethods,\n    'optIn',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Makes a close out call to an existing instance of the ${app.name} smart contract`,\n    app.closeOutMethods,\n    'closeOut',\n  )\n\n  yield* callComposerTypeClearState(ctx)\n\n  yield* jsDoc({\n    description: 'Adds a transaction to the composer',\n    params: {\n      txn: 'A transaction to add to the transaction group',\n      signer: 'The optional signer to use when signing this transaction.',\n    },\n  })\n  yield `addTransaction(txn: Transaction, signer?: TransactionSigner): ${name}Composer<TReturns>`\n\n  yield* jsDoc({\n    description: 'Returns the underlying AtomicTransactionComposer instance',\n  })\n  yield `composer(): Promise<TransactionComposer>`\n\n  yield* jsDoc({\n    description: 'Simulates the transaction group and returns the result',\n  })\n  yield `simulate(): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n  yield `simulate(options: SkipSignaturesSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n  yield `simulate(options: RawSimulateOptions): Promise<${name}ComposerResults<TReturns> & { simulateResponse: SimulateResponse }>`\n\n  yield* jsDoc({\n    description: 'Sends the transaction group to the network and returns the results',\n  })\n  yield `send(params?: SendParams): Promise<${name}ComposerResults<TReturns>>`\n\n  yield DecIndentAndCloseBlock\n\n  yield `\n  export type ${name}ComposerResults<TReturns extends [...any[]]> = Expand<SendTransactionComposerResults & {\n    returns: TReturns\n  }>\n  `\n}\n\nfunction* callComposerTypeClearState({ app, name }: GeneratorContext): DocumentParts {\n  yield* jsDoc({\n    description: `Makes a clear_state call to an existing instance of the ${app.name} smart contract.`,\n    params: {\n      params: `Any additional parameters for the bare call`,\n    },\n    returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n  })\n  yield `clearState(params?: AppClientBareCallParams): ${name}Composer<[...TReturns, undefined]>`\n  yield NewLine\n}\n\nfunction* callComposerTypeNoops({ app, name, sanitizer }: GeneratorContext): DocumentParts {\n  for (const method of app.noOpMethods) {\n    if (!isAbiMethod(method)) continue\n    const methodSig = method.signature\n    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\n    const methodName = method.uniqueName.makeSafeMethodIdentifier\n\n    yield* jsDoc({\n      description: `Calls the ${methodSig} ABI method.`,\n      abiDescription: method.desc,\n      params: {\n        params: `Any additional parameters for the call`,\n      },\n      returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n    })\n    const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`\n    yield `${methodName}(params?: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>): ${name}Composer<${updatedReturnType}>`\n    yield NewLine\n  }\n}\n\nfunction* callComposerOperationMethodType(\n  { name, sanitizer }: GeneratorContext,\n  description: string,\n  methods: AppClientMethodContext[],\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\n    yield `readonly ${verb}: {`\n    yield IncIndent\n    for (const method of methods) {\n      const onComplete = verb === 'create' ? method.createActions.inputType : undefined\n      if (!isAbiMethod(method)) {\n        yield* jsDoc({\n          description: `${description} using a bare call.`,\n          params: {\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        yield `bare(params${onComplete?.isOptional !== false ? '?' : ''}: AppClientBareCallParams ${\n          includeCompilation ? '& AppClientCompilationParams' : ''\n        }): ${name}Composer<TReturns>`\n      } else {\n        const uniqueName = method.uniqueName.original\n        yield* jsDoc({\n          description: `${description} using the ${method.signature} ABI method.`,\n          params: {\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n\n        const updatedReturnType = `[...TReturns, ${name}Returns['${methodSigSafe}'] | undefined]`\n        yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(params${\n          onComplete?.isOptional !== false ? '?' : ''\n        }: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n          onComplete?.typeLiteral ? ` & ${onComplete.typeLiteral}` : ''\n        }): ${name}Composer<${updatedReturnType}>`\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n"],"names":[],"mappings":"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"}

package/{client → src/client}/call-composer.js

@@ -1,28 +1,25 @@
 'use strict';
 
 var writer = require('../output/writer.js');
-var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
-var deployTypes = require('./deploy-types.js');
-var algosdk = require('algosdk');
+var appClientContext = require('./app-client-context.js');
 
 function* composeMethod(ctx) {
-    const { name, callConfig } = ctx;
+    const { name, app } = ctx;
     // todo: Patrick feedback - allow common params to be passed in here so they propagate to all params calls e.g. firstValid
-    yield `public newGroup(): ${name}Composer {`;
+    yield `public newGroup(composerConfig?: TransactionComposerConfig): ${name}Composer {`;
     yield writer.IncIndent;
     yield `const client = this`;
-    yield `const composer = this.algorand.newGroup()`;
+    yield `const composer = this.algorand.newGroup(composerConfig)`;
     yield `let promiseChain:Promise<unknown> = Promise.resolve()`;
-    yield `const resultMappers: Array<undefined | ((x: ABIReturn | undefined) => any)> = []`;
     yield `return {`;
     yield writer.IncIndent;
     yield* callComposerNoops(ctx);
     if (ctx.mode === 'full') {
-        yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true);
-        yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete');
+        yield* callComposerOperationMethods(ctx, app.updateMethods, 'update', true);
+        yield* callComposerOperationMethods(ctx, app.deleteMethods, 'delete');
     }
-    yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn');
-    yield* callComposerOperationMethods(ctx, callConfig.closeOutMethods, 'closeOut');
+    yield* callComposerOperationMethods(ctx, app.optInMethods, 'optIn');
+    yield* callComposerOperationMethods(ctx, app.closeOutMethods, 'closeOut');
     yield* callComposerClearState(ctx);
     yield `addTransaction(txn: Transaction, signer?: TransactionSigner) {`;
     yield writer.IncIndent;
@@ -43,7 +40,7 @@ function* composeMethod(ctx) {
     yield `return {`;
     yield writer.IncIndent;
     yield `...result,`;
-    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
+    yield `returns: result.returns?.map(val => val.returnValue)`;
     yield writer.DecIndentAndCloseBlock;
     yield writer.DecIndent;
     yield '},';
@@ -54,36 +51,34 @@ function* composeMethod(ctx) {
     yield `return {`;
     yield writer.IncIndent;
     yield `...result,`;
-    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
+    yield `returns: result.returns?.map(val => val.returnValue)`;
     yield writer.DecIndentAndCloseBlock;
     yield writer.DecIndentAndCloseBlock;
     yield writer.DecIndent;
     yield `} as unknown as ${name}Composer`;
     yield writer.DecIndentAndCloseBlock;
 }
-function* callComposerNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
-    if (callConfig.callMethods.includes(getCallConfigSummary.BARE_CALL)) {
+function* callComposerNoops({ app, name, sanitizer }) {
+    if (app.bareMethod.callActions.noOp) {
         yield* writer.jsDoc(`Add a bare method call to the ${app.name} contract`);
-        yield `bare(params: AppClientBareCallParams & ${deployTypes.getCallOnCompleteOptions(getCallConfigSummary.BARE_CALL, app).type}) {`;
+        yield `bare(params: AppClientBareCallParams & ${app.bareMethod.callActions.inputType.typeLiteral}) {`;
         yield writer.IncIndent;
         yield `promiseChain = promiseChain.then(() => composer.addAppCall(client.params.bare(params)))`;
         yield `return this`;
         yield writer.DecIndent;
         yield '},';
     }
-    for (const methodSignature of callConfig.callMethods.filter((m) => m !== getCallConfigSummary.BARE_CALL).map((m) => m)) {
-        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
-        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+    for (const method of app.abiMethods) {
+        const methodName = method.uniqueName.makeSafeMethodIdentifier;
+        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
         const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
         // Skip methods which don't support a no_op call config
-        if (!callConfig.callMethods.includes(methodSignature))
+        if (!method.callActions.noOp)
             continue;
-        yield* writer.jsDoc(`Add a ${methodSignature} method call against the ${app.name} contract`);
-        yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${deployTypes.getCallOnCompleteOptions(methodSignature, app).type}) {`;
+        yield* writer.jsDoc(`Add a ${method.signature} method call against the ${app.name} contract`);
+        yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${method.callActions.inputType.typeLiteral}) {`;
         yield writer.IncIndent;
         yield `promiseChain = promiseChain.then(async () => composer.addAppCallMethodCall(await client.params${methodNameAccessor}(params)))`;
-        const outputTypeName = app.methods.find((m) => new algosdk.ABIMethod(m).getSignature() === methodSignature)?.returns.type;
-        yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`;
         yield `return this`;
         yield writer.DecIndent;
         yield '},';
@@ -98,15 +93,15 @@ function* callComposerClearState({ app }) {
     yield writer.DecIndent;
     yield '},';
 }
-function* callComposerOperationMethods({ app, name, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
+function* callComposerOperationMethods({ name, sanitizer }, methods, verb, includeCompilation) {
     const callType = verb === 'update' ? 'Update' : verb === 'delete' ? 'Delete' : 'Call';
     if (methods.length) {
         yield `get ${verb}() {`;
         yield writer.IncIndent;
         yield `return {`;
         yield writer.IncIndent;
-        for (const methodSig of methods) {
-            if (methodSig === getCallConfigSummary.BARE_CALL) {
+        for (const method of methods) {
+            if (!appClientContext.isAbiMethod(method)) {
                 yield `bare: (params?: AppClientBareCallParams ${includeCompilation ? '& AppClientCompilationParams ' : ''}) => {`;
                 yield writer.IncIndent;
                 yield `promiseChain = promiseChain.then(${verb === 'update' ? 'async ' : ''}() => composer.addApp${callType}(${verb === 'update' ? 'await ' : ''}client.params.${verb}.bare(params)))`;
@@ -115,15 +110,13 @@ function* callComposerOperationMethods({ app, name, methodSignatureToUniqueName,
                 yield '},';
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[methodSig];
+                const uniqueName = method.uniqueName.original;
                 const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName);
                 const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
                 yield `${methodName}: (params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}) => {`;
                 yield writer.IncIndent;
                 yield `promiseChain = promiseChain.then(async () => composer.addApp${callType}MethodCall(await client.params.${verb}${methodNameAccessor}(params)))`;
-                const outputTypeName = app.methods.find((m) => new algosdk.ABIMethod(m).getSignature() === methodSig)?.returns.type;
-                yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`;
                 yield `return this`;
                 yield writer.DecIndent;
                 yield '},';

package/src/client/call-composer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer.js","sources":["../../../src/client/call-composer.ts"],"sourcesContent":["import { DecIndent, DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport { AppClientMethodContext, isAbiMethod } from './app-client-context'\n\nexport function* composeMethod(ctx: GeneratorContext): DocumentParts {\n  const { name, app } = ctx\n  // todo: Patrick feedback - allow common params to be passed in here so they propagate to all params calls e.g. firstValid\n  yield `public newGroup(composerConfig?: TransactionComposerConfig): ${name}Composer {`\n  yield IncIndent\n\n  yield `const client = this`\n  yield `const composer = this.algorand.newGroup(composerConfig)`\n  yield `let promiseChain:Promise<unknown> = Promise.resolve()`\n  yield `return {`\n  yield IncIndent\n\n  yield* callComposerNoops(ctx)\n  if (ctx.mode === 'full') {\n    yield* callComposerOperationMethods(ctx, app.updateMethods, 'update', true)\n    yield* callComposerOperationMethods(ctx, app.deleteMethods, 'delete')\n  }\n  yield* callComposerOperationMethods(ctx, app.optInMethods, 'optIn')\n  yield* callComposerOperationMethods(ctx, app.closeOutMethods, 'closeOut')\n  yield* callComposerClearState(ctx)\n\n  yield `addTransaction(txn: Transaction, signer?: TransactionSigner) {`\n  yield IncIndent\n  yield 'promiseChain = promiseChain.then(() => composer.addTransaction(txn, signer))'\n  yield 'return this'\n  yield DecIndent\n  yield '},'\n\n  yield `async composer() {`\n  yield IncIndent\n  yield `await promiseChain`\n  yield 'return composer'\n  yield DecIndent\n  yield '},'\n\n  yield `async simulate(options?: SimulateOptions) {`\n  yield IncIndent\n  yield `await promiseChain`\n  yield `const result = await (!options ? composer.simulate() : composer.simulate(options))`\n  yield `return {`\n  yield IncIndent\n  yield `...result,`\n  yield `returns: result.returns?.map(val => val.returnValue)`\n  yield DecIndentAndCloseBlock\n  yield DecIndent\n  yield '},'\n\n  yield `async send(params?: SendParams) {`\n  yield IncIndent\n  yield `await promiseChain`\n  yield `const result = await composer.send(params)`\n  yield `return {`\n  yield IncIndent\n  yield `...result,`\n  yield `returns: result.returns?.map(val => val.returnValue)`\n  yield DecIndentAndCloseBlock\n  yield DecIndentAndCloseBlock\n  yield DecIndent\n  yield `} as unknown as ${name}Composer`\n\n  yield DecIndentAndCloseBlock\n}\n\nfunction* callComposerNoops({ app, name, sanitizer }: GeneratorContext): DocumentParts {\n  if (app.bareMethod.callActions.noOp) {\n    yield* jsDoc(`Add a bare method call to the ${app.name} contract`)\n    yield `bare(params: AppClientBareCallParams & ${app.bareMethod.callActions.inputType.typeLiteral}) {`\n    yield IncIndent\n    yield `promiseChain = promiseChain.then(() => composer.addAppCall(client.params.bare(params)))`\n    yield `return this`\n    yield DecIndent\n    yield '},'\n  }\n\n  for (const method of app.abiMethods) {\n    const methodName = method.uniqueName.makeSafeMethodIdentifier\n    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n    const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n    // Skip methods which don't support a no_op call config\n    if (!method.callActions.noOp) continue\n    yield* jsDoc(`Add a ${method.signature} method call against the ${app.name} contract`)\n    yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${method.callActions.inputType.typeLiteral}) {`\n    yield IncIndent\n    yield `promiseChain = promiseChain.then(async () => composer.addAppCallMethodCall(await client.params${methodNameAccessor}(params)))`\n    yield `return this`\n    yield DecIndent\n    yield '},'\n  }\n}\n\nfunction* callComposerClearState({ app }: GeneratorContext): DocumentParts {\n  yield* jsDoc(`Add a clear state call to the ${app.name} contract`)\n  yield `clearState(params: AppClientBareCallParams) {`\n  yield IncIndent\n  yield `promiseChain = promiseChain.then(() => composer.addAppCall(client.params.clearState(params)))`\n  yield `return this`\n  yield DecIndent\n  yield '},'\n}\n\nfunction* callComposerOperationMethods(\n  { name, sanitizer }: GeneratorContext,\n  methods: AppClientMethodContext[],\n  verb: 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  const callType = verb === 'update' ? 'Update' : verb === 'delete' ? 'Delete' : 'Call'\n  if (methods.length) {\n    yield `get ${verb}() {`\n    yield IncIndent\n    yield `return {`\n    yield IncIndent\n    for (const method of methods) {\n      if (!isAbiMethod(method)) {\n        yield `bare: (params?: AppClientBareCallParams ${includeCompilation ? '& AppClientCompilationParams ' : ''}) => {`\n        yield IncIndent\n        yield `promiseChain = promiseChain.then(${verb === 'update' ? 'async ' : ''}() => composer.addApp${callType}(${verb === 'update' ? 'await ' : ''}client.params.${verb}.bare(params)))`\n        yield `return this`\n        yield DecIndent\n        yield '},'\n      } else {\n        const uniqueName = method.uniqueName.original\n        const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName)\n        const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        yield `${methodName}: (params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}) => {`\n        yield IncIndent\n        yield `promiseChain = promiseChain.then(async () => composer.addApp${callType}MethodCall(await client.params.${verb}${methodNameAccessor}(params)))`\n        yield `return this`\n        yield DecIndent\n        yield '},'\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndent\n    yield '},'\n  }\n}\n"],"names":["IncIndent","DecIndent","DecIndentAndCloseBlock","jsDoc","isAbiMethod"],"mappings":"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"}

package/{client → src/client}/call-composer.mjs

@@ -1,26 +1,23 @@
 import { IncIndent, DecIndent, DecIndentAndCloseBlock, jsDoc } from '../output/writer.mjs';
-import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
-import { getCallOnCompleteOptions } from './deploy-types.mjs';
-import { ABIMethod } from 'algosdk';
+import { isAbiMethod } from './app-client-context.mjs';
 
 function* composeMethod(ctx) {
-    const { name, callConfig } = ctx;
+    const { name, app } = ctx;
     // todo: Patrick feedback - allow common params to be passed in here so they propagate to all params calls e.g. firstValid
-    yield `public newGroup(): ${name}Composer {`;
+    yield `public newGroup(composerConfig?: TransactionComposerConfig): ${name}Composer {`;
     yield IncIndent;
     yield `const client = this`;
-    yield `const composer = this.algorand.newGroup()`;
+    yield `const composer = this.algorand.newGroup(composerConfig)`;
     yield `let promiseChain:Promise<unknown> = Promise.resolve()`;
-    yield `const resultMappers: Array<undefined | ((x: ABIReturn | undefined) => any)> = []`;
     yield `return {`;
     yield IncIndent;
     yield* callComposerNoops(ctx);
     if (ctx.mode === 'full') {
-        yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true);
-        yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete');
+        yield* callComposerOperationMethods(ctx, app.updateMethods, 'update', true);
+        yield* callComposerOperationMethods(ctx, app.deleteMethods, 'delete');
     }
-    yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn');
-    yield* callComposerOperationMethods(ctx, callConfig.closeOutMethods, 'closeOut');
+    yield* callComposerOperationMethods(ctx, app.optInMethods, 'optIn');
+    yield* callComposerOperationMethods(ctx, app.closeOutMethods, 'closeOut');
     yield* callComposerClearState(ctx);
     yield `addTransaction(txn: Transaction, signer?: TransactionSigner) {`;
     yield IncIndent;
@@ -41,7 +38,7 @@ function* composeMethod(ctx) {
     yield `return {`;
     yield IncIndent;
     yield `...result,`;
-    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
+    yield `returns: result.returns?.map(val => val.returnValue)`;
     yield DecIndentAndCloseBlock;
     yield DecIndent;
     yield '},';
@@ -52,36 +49,34 @@ function* composeMethod(ctx) {
     yield `return {`;
     yield IncIndent;
     yield `...result,`;
-    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
+    yield `returns: result.returns?.map(val => val.returnValue)`;
     yield DecIndentAndCloseBlock;
     yield DecIndentAndCloseBlock;
     yield DecIndent;
     yield `} as unknown as ${name}Composer`;
     yield DecIndentAndCloseBlock;
 }
-function* callComposerNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
-    if (callConfig.callMethods.includes(BARE_CALL)) {
+function* callComposerNoops({ app, name, sanitizer }) {
+    if (app.bareMethod.callActions.noOp) {
         yield* jsDoc(`Add a bare method call to the ${app.name} contract`);
-        yield `bare(params: AppClientBareCallParams & ${getCallOnCompleteOptions(BARE_CALL, app).type}) {`;
+        yield `bare(params: AppClientBareCallParams & ${app.bareMethod.callActions.inputType.typeLiteral}) {`;
         yield IncIndent;
         yield `promiseChain = promiseChain.then(() => composer.addAppCall(client.params.bare(params)))`;
         yield `return this`;
         yield DecIndent;
         yield '},';
     }
-    for (const methodSignature of callConfig.callMethods.filter((m) => m !== BARE_CALL).map((m) => m)) {
-        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
-        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+    for (const method of app.abiMethods) {
+        const methodName = method.uniqueName.makeSafeMethodIdentifier;
+        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
         const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
         // Skip methods which don't support a no_op call config
-        if (!callConfig.callMethods.includes(methodSignature))
+        if (!method.callActions.noOp)
             continue;
-        yield* jsDoc(`Add a ${methodSignature} method call against the ${app.name} contract`);
-        yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${getCallOnCompleteOptions(methodSignature, app).type}) {`;
+        yield* jsDoc(`Add a ${method.signature} method call against the ${app.name} contract`);
+        yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${method.callActions.inputType.typeLiteral}) {`;
         yield IncIndent;
         yield `promiseChain = promiseChain.then(async () => composer.addAppCallMethodCall(await client.params${methodNameAccessor}(params)))`;
-        const outputTypeName = app.methods.find((m) => new ABIMethod(m).getSignature() === methodSignature)?.returns.type;
-        yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`;
         yield `return this`;
         yield DecIndent;
         yield '},';
@@ -96,15 +91,15 @@ function* callComposerClearState({ app }) {
     yield DecIndent;
     yield '},';
 }
-function* callComposerOperationMethods({ app, name, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
+function* callComposerOperationMethods({ name, sanitizer }, methods, verb, includeCompilation) {
     const callType = verb === 'update' ? 'Update' : verb === 'delete' ? 'Delete' : 'Call';
     if (methods.length) {
         yield `get ${verb}() {`;
         yield IncIndent;
         yield `return {`;
         yield IncIndent;
-        for (const methodSig of methods) {
-            if (methodSig === BARE_CALL) {
+        for (const method of methods) {
+            if (!isAbiMethod(method)) {
                 yield `bare: (params?: AppClientBareCallParams ${includeCompilation ? '& AppClientCompilationParams ' : ''}) => {`;
                 yield IncIndent;
                 yield `promiseChain = promiseChain.then(${verb === 'update' ? 'async ' : ''}() => composer.addApp${callType}(${verb === 'update' ? 'await ' : ''}client.params.${verb}.bare(params)))`;
@@ -113,15 +108,13 @@ function* callComposerOperationMethods({ app, name, methodSignatureToUniqueName,
                 yield '},';
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[methodSig];
+                const uniqueName = method.uniqueName.original;
                 const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName);
                 const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
                 yield `${methodName}: (params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}) => {`;
                 yield IncIndent;
                 yield `promiseChain = promiseChain.then(async () => composer.addApp${callType}MethodCall(await client.params.${verb}${methodNameAccessor}(params)))`;
-                const outputTypeName = app.methods.find((m) => new ABIMethod(m).getSignature() === methodSig)?.returns.type;
-                yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`;
                 yield `return this`;
                 yield DecIndent;
                 yield '},';