@algorandfoundation/algokit-client-generator 6.0.2-beta.1 → 7.0.0-alpha.2

package/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/client/call-composer.js.map

@@ -1 +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 { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { getCallOnCompleteOptions } from './deploy-types'\nimport { ABIMethod, ABIMethodParams } from 'algosdk'\n\nexport function* composeMethod(ctx: GeneratorContext): DocumentParts {\n  const { name, callConfig } = 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(): ${name}Composer {`\n  yield IncIndent\n\n  yield `const client = this`\n  yield `const composer = this.algorand.newGroup()`\n  yield `let promiseChain:Promise<unknown> = Promise.resolve()`\n  yield `const resultMappers: Array<undefined | ((x: ABIReturn | undefined) => any)> = []`\n  yield `return {`\n  yield IncIndent\n\n  yield* callComposerNoops(ctx)\n  if (ctx.mode === 'full') {\n    yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true)\n    yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete')\n  }\n  yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn')\n  yield* callComposerOperationMethods(ctx, callConfig.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, i) => resultMappers[i] !== undefined ? resultMappers[i]!(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, i) => resultMappers[i] !== undefined ? resultMappers[i]!(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, callConfig, methodSignatureToUniqueName, sanitizer }: GeneratorContext): DocumentParts {\n  if (callConfig.callMethods.includes(BARE_CALL)) {\n    yield* jsDoc(`Add a bare method call to the ${app.name} contract`)\n    yield `bare(params: AppClientBareCallParams & ${getCallOnCompleteOptions(BARE_CALL, app).type}) {`\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 methodSignature of callConfig.callMethods.filter((m) => m !== BARE_CALL).map((m) => m as string)) {\n    const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature])\n    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature)\n    const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n    // Skip methods which don't support a no_op call config\n    if (!callConfig.callMethods.includes(methodSignature)) continue\n    yield* jsDoc(`Add a ${methodSignature} method call against the ${app.name} contract`)\n    yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${getCallOnCompleteOptions(methodSignature, app).type}) {`\n    yield IncIndent\n    yield `promiseChain = promiseChain.then(async () => composer.addAppCallMethodCall(await client.params${methodNameAccessor}(params)))`\n    const outputTypeName = app.methods.find((m: ABIMethodParams) => new ABIMethod(m).getSignature() === methodSignature)?.returns.type\n    yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`\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  { app, name, methodSignatureToUniqueName, sanitizer }: GeneratorContext,\n  methods: MethodList,\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 methodSig of methods) {\n      if (methodSig === BARE_CALL) {\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 = methodSignatureToUniqueName[methodSig]\n        const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName)\n        const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\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        const outputTypeName = app.methods.find((m: ABIMethodParams) => new ABIMethod(m).getSignature() === methodSig)?.returns.type\n        yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`\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","BARE_CALL","jsDoc","getCallOnCompleteOptions","ABIMethod"],"mappings":"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"}
+{"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/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 '},';

package/client/call-composer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"call-composer.mjs","sources":["../../src/client/call-composer.ts"],"sourcesContent":["import { DecIndent, DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { getCallOnCompleteOptions } from './deploy-types'\nimport { ABIMethod, ABIMethodParams } from 'algosdk'\n\nexport function* composeMethod(ctx: GeneratorContext): DocumentParts {\n  const { name, callConfig } = 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(): ${name}Composer {`\n  yield IncIndent\n\n  yield `const client = this`\n  yield `const composer = this.algorand.newGroup()`\n  yield `let promiseChain:Promise<unknown> = Promise.resolve()`\n  yield `const resultMappers: Array<undefined | ((x: ABIReturn | undefined) => any)> = []`\n  yield `return {`\n  yield IncIndent\n\n  yield* callComposerNoops(ctx)\n  if (ctx.mode === 'full') {\n    yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true)\n    yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete')\n  }\n  yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn')\n  yield* callComposerOperationMethods(ctx, callConfig.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, i) => resultMappers[i] !== undefined ? resultMappers[i]!(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, i) => resultMappers[i] !== undefined ? resultMappers[i]!(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, callConfig, methodSignatureToUniqueName, sanitizer }: GeneratorContext): DocumentParts {\n  if (callConfig.callMethods.includes(BARE_CALL)) {\n    yield* jsDoc(`Add a bare method call to the ${app.name} contract`)\n    yield `bare(params: AppClientBareCallParams & ${getCallOnCompleteOptions(BARE_CALL, app).type}) {`\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 methodSignature of callConfig.callMethods.filter((m) => m !== BARE_CALL).map((m) => m as string)) {\n    const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature])\n    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature)\n    const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n    // Skip methods which don't support a no_op call config\n    if (!callConfig.callMethods.includes(methodSignature)) continue\n    yield* jsDoc(`Add a ${methodSignature} method call against the ${app.name} contract`)\n    yield `${methodName}(params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & ${getCallOnCompleteOptions(methodSignature, app).type}) {`\n    yield IncIndent\n    yield `promiseChain = promiseChain.then(async () => composer.addAppCallMethodCall(await client.params${methodNameAccessor}(params)))`\n    const outputTypeName = app.methods.find((m: ABIMethodParams) => new ABIMethod(m).getSignature() === methodSignature)?.returns.type\n    yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`\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  { app, name, methodSignatureToUniqueName, sanitizer }: GeneratorContext,\n  methods: MethodList,\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 methodSig of methods) {\n      if (methodSig === BARE_CALL) {\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 = methodSignatureToUniqueName[methodSig]\n        const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName)\n        const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\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        const outputTypeName = app.methods.find((m: ABIMethodParams) => new ABIMethod(m).getSignature() === methodSig)?.returns.type\n        yield `resultMappers.push(${outputTypeName && outputTypeName !== 'void' ? `(v) => client.decodeReturnValue('${methodSigSafe}', v)` : 'undefined'})`\n        yield `return this`\n        yield DecIndent\n        yield '},'\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndent\n    yield '},'\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"call-composer.mjs","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":[],"mappings":"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"}

package/client/deploy-types.d.ts

@@ -1,13 +1,3 @@
 import { DocumentParts } from '../output/writer';
-import { MethodIdentifier } from './helpers/get-call-config-summary';
 import { GeneratorContext } from './generator-context';
-import { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56';
-export declare function getCreateOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract): {
-    type: {};
-    isOptional: boolean | undefined;
-};
-export declare function getCallOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract): {
-    type: {};
-    isOptional: boolean | undefined;
-};
-export declare function deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName }: GeneratorContext): DocumentParts;
+export declare function deployTypes({ app, sanitizer }: GeneratorContext): DocumentParts;

package/client/deploy-types.js

@@ -1,66 +1,43 @@
 'use strict';
 
 var writer = require('../output/writer.js');
-var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
-var algosdk = require('algosdk');
+var appClientContext = require('./app-client-context.js');
 
-function getCreateOnCompleteOptions(method, app) {
-    const validCreateOnCompletes = method === getCallConfigSummary.BARE_CALL ? app.bareActions.create : app.methods.find((m) => new algosdk.ABIMethod(m).getSignature() === method)?.actions?.create;
-    const hasNoOp = validCreateOnCompletes?.includes('NoOp');
-    const onCompleteType = validCreateOnCompletes
-        ? `{onComplete${hasNoOp ? '?' : ''}: ${validCreateOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`
-        : {};
-    return {
-        type: onCompleteType,
-        isOptional: hasNoOp,
-    };
-}
-function getCallOnCompleteOptions(method, app) {
-    const validCallOnCompletes = method === getCallConfigSummary.BARE_CALL ? app.bareActions.call : app.methods.find((m) => new algosdk.ABIMethod(m).getSignature() === method)?.actions?.call;
-    const hasNoOp = validCallOnCompletes?.includes('NoOp');
-    const onCompleteType = validCallOnCompletes
-        ? `{onComplete${hasNoOp ? '?' : ''}: ${validCallOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`
-        : {};
-    return {
-        type: onCompleteType,
-        isOptional: hasNoOp,
-    };
-}
-function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName }) {
-    const name = sanitizer.makeSafeTypeIdentifier(app.name);
-    if (callConfig.createMethods.length > 0) {
+function* deployTypes({ app, sanitizer }) {
+    const name = app.name.makeSafeTypeIdentifier;
+    if (app.createMethods.length) {
         yield* writer.jsDoc('Defines supported create method params for this smart contract');
         yield `export type ${name}CreateCallParams =`;
         yield writer.IncIndent;
-        for (const method of callConfig.createMethods) {
-            const onComplete = getCreateOnCompleteOptions(method, app);
-            if (method === getCallConfigSummary.BARE_CALL) {
-                yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.type} & CreateSchema>`;
+        for (const method of app.createMethods) {
+            const onComplete = method.createActions.inputType;
+            if (!appClientContext.isAbiMethod(method)) {
+                yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.typeLiteral} & CreateSchema>`;
             }
             else {
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                const uniqueName = methodSignatureToUniqueName[method];
-                if (uniqueName !== method) {
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
+                const uniqueName = method.uniqueName.original;
+                if (uniqueName !== method.signature) {
                     const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
-                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.type} & CreateSchema>`;
+                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.typeLiteral} & CreateSchema>`;
                 }
-                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.type} & CreateSchema>`;
+                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.typeLiteral} & CreateSchema>`;
             }
         }
         yield writer.DecIndent;
     }
-    if (callConfig.updateMethods.length > 0) {
+    if (app.updateMethods.length) {
         yield* writer.jsDoc('Defines supported update method params for this smart contract');
         yield `export type ${name}UpdateCallParams =`;
         yield writer.IncIndent;
-        for (const method of callConfig.updateMethods) {
-            if (method === getCallConfigSummary.BARE_CALL) {
+        for (const method of app.updateMethods) {
+            if (!appClientContext.isAbiMethod(method)) {
                 yield `| Expand<AppClientBareCallParams> & {method?: never}`;
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[method];
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                if (uniqueName !== method) {
+                const uniqueName = method.uniqueName.original;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
+                if (uniqueName !== method.signature) {
                     const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
                     yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
                 }
@@ -69,18 +46,18 @@ function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName
         }
         yield writer.DecIndent;
     }
-    if (callConfig.deleteMethods.length > 0) {
+    if (app.deleteMethods.length) {
         yield* writer.jsDoc('Defines supported delete method params for this smart contract');
         yield `export type ${name}DeleteCallParams =`;
         yield writer.IncIndent;
-        for (const method of callConfig.deleteMethods) {
-            if (method === getCallConfigSummary.BARE_CALL) {
+        for (const method of app.deleteMethods) {
+            if (!appClientContext.isAbiMethod(method)) {
                 yield `| Expand<AppClientBareCallParams> & {method?: never}`;
             }
             else {
-                const uniqueName = methodSignatureToUniqueName[method];
-                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                if (uniqueName !== method) {
+                const uniqueName = method.uniqueName.original;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature);
+                if (uniqueName !== method.signature) {
                     const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
                     yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
                 }
@@ -92,15 +69,15 @@ function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName
     yield* writer.jsDoc('Defines arguments required for the deploy method.');
     yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`;
     yield writer.IncIndent;
-    if (callConfig.createMethods.length) {
+    if (app.createMethods.length) {
         yield* writer.jsDoc('Create transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)');
         yield `createParams?: ${name}CreateCallParams`;
     }
-    if (callConfig.updateMethods.length) {
+    if (app.updateMethods.length) {
         yield* writer.jsDoc('Update transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)');
         yield `updateParams?: ${name}UpdateCallParams`;
     }
-    if (callConfig.deleteMethods.length) {
+    if (app.deleteMethods.length) {
         yield* writer.jsDoc('Delete transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)');
         yield `deleteParams?: ${name}DeleteCallParams`;
     }
@@ -110,6 +87,4 @@ function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName
 }
 
 exports.deployTypes = deployTypes;
-exports.getCallOnCompleteOptions = getCallOnCompleteOptions;
-exports.getCreateOnCompleteOptions = getCreateOnCompleteOptions;
 //# sourceMappingURL=deploy-types.js.map

package/client/deploy-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-types.js","sources":["../../src/client/deploy-types.ts"],"sourcesContent":["import { DecIndent, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { BARE_CALL, MethodIdentifier } from './helpers/get-call-config-summary'\nimport { GeneratorContext } from './generator-context'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { ABIMethod } from 'algosdk'\n\nexport function getCreateOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract) {\n  const validCreateOnCompletes =\n    method === BARE_CALL ? app.bareActions.create : app.methods.find((m) => new ABIMethod(m).getSignature() === method)?.actions?.create\n  const hasNoOp = validCreateOnCompletes?.includes('NoOp')\n  const onCompleteType = validCreateOnCompletes\n    ? `{onComplete${hasNoOp ? '?' : ''}: ${validCreateOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`\n    : {}\n  return {\n    type: onCompleteType,\n    isOptional: hasNoOp,\n  }\n}\n\nexport function getCallOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract) {\n  const validCallOnCompletes =\n    method === BARE_CALL ? app.bareActions.call : app.methods.find((m) => new ABIMethod(m).getSignature() === method)?.actions?.call\n  const hasNoOp = validCallOnCompletes?.includes('NoOp')\n  const onCompleteType = validCallOnCompletes\n    ? `{onComplete${hasNoOp ? '?' : ''}: ${validCallOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`\n    : {}\n  return {\n    type: onCompleteType,\n    isOptional: hasNoOp,\n  }\n}\n\nexport function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName }: GeneratorContext): DocumentParts {\n  const name = sanitizer.makeSafeTypeIdentifier(app.name)\n\n  if (callConfig.createMethods.length > 0) {\n    yield* jsDoc('Defines supported create method params for this smart contract')\n    yield `export type ${name}CreateCallParams =`\n    yield IncIndent\n    for (const method of callConfig.createMethods) {\n      const onComplete = getCreateOnCompleteOptions(method, app)\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.type} & CreateSchema>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        const uniqueName = methodSignatureToUniqueName[method]\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.type} & CreateSchema>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.type} & CreateSchema>`\n      }\n    }\n    yield DecIndent\n  }\n  if (callConfig.updateMethods.length > 0) {\n    yield* jsDoc('Defines supported update method params for this smart contract')\n    yield `export type ${name}UpdateCallParams =`\n    yield IncIndent\n    for (const method of callConfig.updateMethods) {\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[method]\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  if (callConfig.deleteMethods.length > 0) {\n    yield* jsDoc('Defines supported delete method params for this smart contract')\n    yield `export type ${name}DeleteCallParams =`\n    yield IncIndent\n    for (const method of callConfig.deleteMethods) {\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[method]\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  yield* jsDoc('Defines arguments required for the deploy method.')\n  yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`\n  yield IncIndent\n  if (callConfig.createMethods.length) {\n    yield* jsDoc(\n      'Create transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `createParams?: ${name}CreateCallParams`\n  }\n  if (callConfig.updateMethods.length) {\n    yield* jsDoc(\n      'Update transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `updateParams?: ${name}UpdateCallParams`\n  }\n  if (callConfig.deleteMethods.length) {\n    yield* jsDoc(\n      'Delete transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `deleteParams?: ${name}DeleteCallParams`\n  }\n  yield DecIndent\n  yield `}>`\n  yield NewLine\n}\n"],"names":["BARE_CALL","ABIMethod","jsDoc","IncIndent","DecIndent","NewLine"],"mappings":"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"}
+{"version":3,"file":"deploy-types.js","sources":["../../src/client/deploy-types.ts"],"sourcesContent":["import { DecIndent, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport { isAbiMethod } from './app-client-context'\n\nexport function* deployTypes({ app, sanitizer }: GeneratorContext): DocumentParts {\n  const name = app.name.makeSafeTypeIdentifier\n\n  if (app.createMethods.length) {\n    yield* jsDoc('Defines supported create method params for this smart contract')\n    yield `export type ${name}CreateCallParams =`\n    yield IncIndent\n\n    for (const method of app.createMethods) {\n      const onComplete = method.createActions.inputType\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.typeLiteral} & CreateSchema>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        const uniqueName = method.uniqueName.original\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.typeLiteral} & CreateSchema>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.typeLiteral} & CreateSchema>`\n      }\n    }\n    yield DecIndent\n  }\n  if (app.updateMethods.length) {\n    yield* jsDoc('Defines supported update method params for this smart contract')\n    yield `export type ${name}UpdateCallParams =`\n    yield IncIndent\n\n    for (const method of app.updateMethods) {\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = method.uniqueName.original\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  if (app.deleteMethods.length) {\n    yield* jsDoc('Defines supported delete method params for this smart contract')\n    yield `export type ${name}DeleteCallParams =`\n    yield IncIndent\n    for (const method of app.deleteMethods) {\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = method.uniqueName.original\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  yield* jsDoc('Defines arguments required for the deploy method.')\n  yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`\n  yield IncIndent\n  if (app.createMethods.length) {\n    yield* jsDoc(\n      'Create transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `createParams?: ${name}CreateCallParams`\n  }\n  if (app.updateMethods.length) {\n    yield* jsDoc(\n      'Update transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `updateParams?: ${name}UpdateCallParams`\n  }\n  if (app.deleteMethods.length) {\n    yield* jsDoc(\n      'Delete transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `deleteParams?: ${name}DeleteCallParams`\n  }\n  yield DecIndent\n  yield `}>`\n  yield NewLine\n}\n"],"names":["jsDoc","IncIndent","isAbiMethod","DecIndent","NewLine"],"mappings":"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"}