@algorandfoundation/algokit-client-generator 3.0.6 → 4.0.0-alpha.1

package/client/call-composer.mjs

@@ -1,16 +1,17 @@
-import { IncIndent, DecIndent, DecIndentAndCloseBlock } from '../output/writer.mjs';
-import * as algokit from '@algorandfoundation/algokit-utils';
+import { IncIndent, DecIndent, DecIndentAndCloseBlock, jsDoc } from '../output/writer.mjs';
 import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
-import { getCreateOnCompleteOptions } from './deploy-types.mjs';
+import { getCallOnCompleteOptions } from './deploy-types.mjs';
+import { ABIMethod } from 'algosdk';
 
 function* composeMethod(ctx) {
     const { name, callConfig } = ctx;
-    yield `public compose(): ${name}Composer {`;
+    // 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 IncIndent;
     yield `const client = this`;
-    yield `const atc = new AtomicTransactionComposer()`;
+    yield `const composer = this.algorand.newGroup()`;
     yield `let promiseChain:Promise<unknown> = Promise.resolve()`;
-    yield `const resultMappers: Array<undefined | ((x: any) => any)> = []`;
+    yield `const resultMappers: Array<undefined | ((x: ABIReturn | undefined) => any)> = []`;
     yield `return {`;
     yield IncIndent;
     yield* callComposerNoops(ctx);
@@ -18,88 +19,94 @@ function* composeMethod(ctx) {
     yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete');
     yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn');
     yield* callComposerOperationMethods(ctx, callConfig.closeOutMethods, 'closeOut');
-    yield* callComposerClearState();
-    yield `addTransaction(txn: TransactionWithSigner | TransactionToSign | Transaction | Promise<SendTransactionResult>, defaultSender?: SendTransactionFrom) {`;
+    yield* callComposerClearState(ctx);
+    yield `addTransaction(txn: Transaction, signer?: TransactionSigner) {`;
     yield IncIndent;
-    yield 'promiseChain = promiseChain.then(async () => atc.addTransaction(await algokit.getTransactionWithSigner(txn, defaultSender ??' +
-        ' client.sender)))';
+    yield 'promiseChain = promiseChain.then(() => composer.addTransaction(txn, signer))';
     yield 'return this';
     yield DecIndent;
     yield '},';
-    yield `async atc() {`;
+    yield `async composer() {`;
     yield IncIndent;
-    yield 'await promiseChain';
-    yield 'return atc';
+    yield `await promiseChain`;
+    yield 'return composer';
     yield DecIndent;
     yield '},';
     yield `async simulate(options?: SimulateOptions) {`;
     yield IncIndent;
     yield `await promiseChain`;
-    yield `const result = await atc.simulate(client.algod, new modelsv2.SimulateRequest({ txnGroups: [], ...options }))`;
+    yield `const result = await composer.simulate(options)`;
     yield `return {`;
     yield IncIndent;
     yield `...result,`;
-    yield `returns: result.methodResults?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val.returnValue) : val.returnValue)`;
+    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
     yield DecIndentAndCloseBlock;
     yield DecIndent;
     yield '},';
-    yield `async execute(sendParams?: AppClientComposeExecuteParams) {`;
+    yield `async send(params?: SendParams) {`;
     yield IncIndent;
     yield `await promiseChain`;
-    yield `const result = await algokit.sendAtomicTransactionComposer({ atc, sendParams }, client.algod)`;
+    yield `const result = await composer.send(params)`;
     yield `return {`;
     yield IncIndent;
     yield `...result,`;
-    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val.returnValue) : val.returnValue)`;
+    yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val) : val.returnValue)`;
     yield DecIndentAndCloseBlock;
     yield DecIndentAndCloseBlock;
     yield DecIndent;
     yield `} as unknown as ${name}Composer`;
     yield DecIndentAndCloseBlock;
 }
-function* callComposerNoops({ app, callConfig, methodSignatureToUniqueName, sanitizer }) {
-    for (const method of app.contract.methods) {
-        const methodSignature = algokit.getABIMethodSignature(method);
+function* callComposerNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
+    if (callConfig.callMethods.includes(BARE_CALL)) {
+        yield* jsDoc(`Add a bare method call to the ${app.name} contract`);
+        yield `bare(params: AppClientBareCallParams & ${getCallOnCompleteOptions(BARE_CALL, app).type}) {`;
+        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 methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
         const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
         // Skip methods which don't support a no_op call config
         if (!callConfig.callMethods.includes(methodSignature))
             continue;
-        yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
+        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 IncIndent;
-        yield `promiseChain = promiseChain.then(() => client${methodNameAccessor}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
-        const outputTypeName = app.hints?.[methodSignature]?.structs?.output?.name;
-        yield `resultMappers.push(${outputTypeName ?? 'undefined'})`;
+        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 '},';
     }
 }
-function* callComposerClearState() {
-    yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
+function* callComposerClearState({ app }) {
+    yield* jsDoc(`Add a clear state call to the ${app.name} contract`);
+    yield `clearState(params: AppClientBareCallParams) {`;
     yield IncIndent;
-    yield `promiseChain = promiseChain.then(() => client.clearState({...args, sendParams: {...args?.sendParams, skipSending: true, atc}}))`;
-    yield `resultMappers.push(undefined)`;
+    yield `promiseChain = promiseChain.then(() => composer.addAppCall(client.params.clearState(params)))`;
     yield `return this`;
     yield DecIndent;
     yield '},';
 }
-function* callComposerOperationMethods({ app, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
+function* callComposerOperationMethods({ app, name, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
+    const callType = verb === 'update' ? 'Update' : verb === 'delete' ? 'Delete' : 'Call';
     if (methods.length) {
         yield `get ${verb}() {`;
         yield IncIndent;
-        yield `const $this = this`;
         yield `return {`;
         yield IncIndent;
         for (const methodSig of methods) {
-            const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined;
             if (methodSig === BARE_CALL) {
-                yield `bare(args${onComplete?.isOptional !== false ? '?' : ''}: BareCallArgs & AppClientComposeCallCoreParams ${includeCompilation ? '& AppClientCompilationParams ' : ''}& CoreAppCallArgs${onComplete?.type ? ` & ${onComplete.type}` : ''}) {`;
+                yield `bare: (params?: AppClientBareCallParams ${includeCompilation ? '& AppClientCompilationParams ' : ''}) => {`;
                 yield IncIndent;
-                yield `promiseChain = promiseChain.then(() => client.${verb}.bare({...args, sendParams: {...args?.sendParams, skipSending: true, atc}}))`;
-                yield `resultMappers.push(undefined)`;
-                yield `return $this`;
+                yield `promiseChain = promiseChain.then(${verb === 'update' ? 'async ' : ''}() => composer.addApp${callType}(${verb === 'update' ? 'await ' : ''}client.params.${verb}.bare(params)))`;
+                yield `return this`;
                 yield DecIndent;
                 yield '},';
             }
@@ -108,12 +115,12 @@ function* callComposerOperationMethods({ app, methodSignatureToUniqueName, sanit
                 const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName);
                 const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
-                yield `${methodName}(args: MethodArgs<'${methodSigSafe}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}) {`;
+                yield `${methodName}: (params: CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']>${includeCompilation ? ' & AppClientCompilationParams' : ''}) => {`;
                 yield IncIndent;
-                yield `promiseChain = promiseChain.then(() => client.${verb}${methodNameAccessor}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
-                const outputTypeName = app.hints?.[methodSig]?.structs?.output?.name;
-                yield `resultMappers.push(${outputTypeName ?? 'undefined'})`;
-                yield `return $this`;
+                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 } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport * as algokit from '@algorandfoundation/algokit-utils'\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { getCreateOnCompleteOptions } from './deploy-types'\n\nexport function* composeMethod(ctx: GeneratorContext): DocumentParts {\n  const { name, callConfig } = ctx\n  yield `public compose(): ${name}Composer {`\n  yield IncIndent\n\n  yield `const client = this`\n  yield `const atc = new AtomicTransactionComposer()`\n  yield `let promiseChain:Promise<unknown> = Promise.resolve()`\n  yield `const resultMappers: Array<undefined | ((x: any) => any)> = []`\n  yield `return {`\n  yield IncIndent\n\n  yield* callComposerNoops(ctx)\n  yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true)\n  yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete')\n  yield* callComposerOperationMethods(ctx, callConfig.optInMethods, 'optIn')\n  yield* callComposerOperationMethods(ctx, callConfig.closeOutMethods, 'closeOut')\n  yield* callComposerClearState()\n\n  yield `addTransaction(txn: TransactionWithSigner | TransactionToSign | Transaction | Promise<SendTransactionResult>, defaultSender?: SendTransactionFrom) {`\n  yield IncIndent\n  yield 'promiseChain = promiseChain.then(async () => atc.addTransaction(await algokit.getTransactionWithSigner(txn, defaultSender ??' +\n    ' client.sender)))'\n  yield 'return this'\n  yield DecIndent\n  yield '},'\n\n  yield `async atc() {`\n  yield IncIndent\n  yield 'await promiseChain'\n  yield 'return atc'\n  yield DecIndent\n  yield '},'\n\n  yield `async simulate(options?: SimulateOptions) {`\n  yield IncIndent\n  yield `await promiseChain`\n  yield `const result = await atc.simulate(client.algod, new modelsv2.SimulateRequest({ txnGroups: [], ...options }))`\n  yield `return {`\n  yield IncIndent\n  yield `...result,`\n  yield `returns: result.methodResults?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val.returnValue) : val.returnValue)`\n  yield DecIndentAndCloseBlock\n  yield DecIndent\n  yield '},'\n\n  yield `async execute(sendParams?: AppClientComposeExecuteParams) {`\n  yield IncIndent\n  yield `await promiseChain`\n  yield `const result = await algokit.sendAtomicTransactionComposer({ atc, sendParams }, client.algod)`\n  yield `return {`\n  yield IncIndent\n  yield `...result,`\n  yield `returns: result.returns?.map((val, i) => resultMappers[i] !== undefined ? resultMappers[i]!(val.returnValue) : 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, callConfig, methodSignatureToUniqueName, sanitizer }: GeneratorContext): DocumentParts {\n  for (const method of app.contract.methods) {\n    const methodSignature = algokit.getABIMethodSignature(method)\n    const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature])\n    const methodSignatureSafe = 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\n    yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`\n    yield IncIndent\n    yield `promiseChain = promiseChain.then(() => client${methodNameAccessor}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`\n    const outputTypeName = app.hints?.[methodSignature]?.structs?.output?.name\n    yield `resultMappers.push(${outputTypeName ?? 'undefined'})`\n    yield `return this`\n    yield DecIndent\n    yield '},'\n  }\n}\n\nfunction* callComposerClearState(): DocumentParts {\n  yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs) {`\n  yield IncIndent\n  yield `promiseChain = promiseChain.then(() => client.clearState({...args, sendParams: {...args?.sendParams, skipSending: true, atc}}))`\n  yield `resultMappers.push(undefined)`\n  yield `return this`\n  yield DecIndent\n  yield '},'\n}\n\nfunction* callComposerOperationMethods(\n  { app, methodSignatureToUniqueName, sanitizer }: GeneratorContext,\n  methods: MethodList,\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield `get ${verb}() {`\n    yield IncIndent\n    yield `const $this = this`\n    yield `return {`\n    yield IncIndent\n    for (const methodSig of methods) {\n      const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined\n      if (methodSig === BARE_CALL) {\n        yield `bare(args${onComplete?.isOptional !== false ? '?' : ''}: BareCallArgs & AppClientComposeCallCoreParams ${\n          includeCompilation ? '& AppClientCompilationParams ' : ''\n        }& CoreAppCallArgs${onComplete?.type ? ` & ${onComplete.type}` : ''}) {`\n        yield IncIndent\n        yield `promiseChain = promiseChain.then(() => client.${verb}.bare({...args, sendParams: {...args?.sendParams, skipSending: true, atc}}))`\n        yield `resultMappers.push(undefined)`\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}(args: MethodArgs<'${methodSigSafe}'>, params${\n          onComplete?.isOptional !== false ? '?' : ''\n        }: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n          onComplete?.type ? ` & ${onComplete.type}` : ''\n        }) {`\n        yield IncIndent\n        yield `promiseChain = promiseChain.then(() => client.${verb}${methodNameAccessor}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`\n        const outputTypeName = app.hints?.[methodSig]?.structs?.output?.name\n        yield `resultMappers.push(${outputTypeName ?? '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 { 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  yield* callComposerOperationMethods(ctx, callConfig.updateMethods, 'update', true)\n  yield* callComposerOperationMethods(ctx, callConfig.deleteMethods, 'delete')\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 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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"}

package/client/deploy-types.d.ts

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

package/client/deploy-types.js

@@ -2,96 +2,114 @@
 
 var writer = require('../output/writer.js');
 var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
-var utilityTypes = require('./utility-types.js');
+var algosdk = require('algosdk');
 
 function getCreateOnCompleteOptions(method, app) {
-    const callConfig = method === getCallConfigSummary.BARE_CALL ? app.bare_call_config : app.hints?.[method]?.call_config;
-    const hasNoOp = callConfig?.no_op === 'ALL' || callConfig?.no_op === 'CREATE';
-    const onCompleteType = callConfig
-        ? `(${Object.entries(callConfig)
-            .filter(([_, value]) => value === 'ALL' || value === 'CREATE')
-            .map(([oc]) => utilityTypes.OnCompleteCodeMap[oc])
-            .join(' | ')})`
+    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* deployTypes({ app, callConfig, sanitizer }) {
-    const name = sanitizer.makeSafeTypeIdentifier(app.contract.name);
+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) {
-        yield* writer.jsDoc(`A factory for available 'create' calls`);
-        yield `export type ${name}CreateCalls = (typeof ${name}CallFactory)['create']`;
-        yield* writer.jsDoc('Defines supported create methods for this smart contract');
+        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 `| (TypedCallParams<undefined> & ${onComplete.type})`;
+                yield `| Expand<AppClientBareCallParams & {method?: undefined} & ${onComplete.type} & CreateSchema>`;
             }
             else {
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| (TypedCallParams<'${methodSigSafe}'> & ${onComplete.type})`;
+                const uniqueName = methodSignatureToUniqueName[method];
+                if (uniqueName !== method) {
+                    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: '${methodSigSafe}'} & ${onComplete.type} & CreateSchema>`;
             }
         }
         yield writer.DecIndent;
     }
     if (callConfig.updateMethods.length > 0) {
-        yield* writer.jsDoc(`A factory for available 'update' calls`);
-        yield `export type ${name}UpdateCalls = (typeof ${name}CallFactory)['update']`;
-        yield* writer.jsDoc('Defines supported update methods for this smart contract');
+        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) {
-                yield `| TypedCallParams<undefined>`;
+                yield `| Expand<AppClientBareCallParams> & {method?: undefined}`;
             }
             else {
+                const uniqueName = methodSignatureToUniqueName[method];
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| TypedCallParams<'${methodSigSafe}'>`;
+                if (uniqueName !== method) {
+                    const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
+                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
+                }
+                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`;
             }
         }
         yield writer.DecIndent;
     }
     if (callConfig.deleteMethods.length > 0) {
-        yield* writer.jsDoc(`A factory for available 'delete' calls`);
-        yield `export type ${name}DeleteCalls = (typeof ${name}CallFactory)['delete']`;
-        yield* writer.jsDoc('Defines supported delete methods for this smart contract');
+        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) {
-                yield `| TypedCallParams<undefined>`;
+                yield `| Expand<AppClientBareCallParams> & {method?: undefined}`;
             }
             else {
+                const uniqueName = methodSignatureToUniqueName[method];
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| TypedCallParams<'${methodSigSafe}'>`;
+                if (uniqueName !== method) {
+                    const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
+                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
+                }
+                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`;
             }
         }
         yield writer.DecIndent;
     }
     yield* writer.jsDoc('Defines arguments required for the deploy method.');
-    yield `export type ${name}DeployArgs = {`;
+    yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`;
     yield writer.IncIndent;
-    yield `deployTimeParams?: TealTemplateParams`;
     if (callConfig.createMethods.length) {
-        yield* writer.jsDoc('A delegate which takes a create call factory and returns the create call params for this smart contract');
-        yield `createCall?: (callFactory: ${name}CreateCalls) => ${name}CreateCallParams`;
+        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) {
-        yield* writer.jsDoc('A delegate which takes a update call factory and returns the update call params for this smart contract');
-        yield `updateCall?: (callFactory: ${name}UpdateCalls) => ${name}UpdateCallParams`;
+        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) {
-        yield* writer.jsDoc('A delegate which takes a delete call factory and returns the delete call params for this smart contract');
-        yield `deleteCall?: (callFactory: ${name}DeleteCalls) => ${name}DeleteCallParams`;
+        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`;
     }
-    yield writer.DecIndentAndCloseBlock;
+    yield writer.DecIndent;
+    yield `}>`;
     yield writer.NewLine;
 }
 
 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, DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\n\nimport { BARE_CALL, MethodIdentifier } from './helpers/get-call-config-summary'\nimport { GeneratorContext } from './generator-context'\nimport { AlgoAppSpec, CallConfig } from '../schema/application'\nimport { OnCompleteCodeMap } from './utility-types'\n\nexport function getCreateOnCompleteOptions(method: MethodIdentifier, app: AlgoAppSpec) {\n  const callConfig = method === BARE_CALL ? app.bare_call_config : app.hints?.[method]?.call_config\n  const hasNoOp = callConfig?.no_op === 'ALL' || callConfig?.no_op === 'CREATE'\n  const onCompleteType = callConfig\n    ? `(${Object.entries(callConfig)\n        .filter(([_, value]) => value === 'ALL' || value === 'CREATE')\n        .map(([oc]) => OnCompleteCodeMap[oc as keyof CallConfig])\n        .join(' | ')})`\n    : {}\n  return {\n    type: onCompleteType,\n    isOptional: hasNoOp,\n  }\n}\n\nexport function* deployTypes({ app, callConfig, sanitizer }: GeneratorContext): DocumentParts {\n  const name = sanitizer.makeSafeTypeIdentifier(app.contract.name)\n\n  if (callConfig.createMethods.length > 0) {\n    yield* jsDoc(`A factory for available 'create' calls`)\n    yield `export type ${name}CreateCalls = (typeof ${name}CallFactory)['create']`\n    yield* jsDoc('Defines supported create methods 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 `| (TypedCallParams<undefined> & ${onComplete.type})`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        yield `| (TypedCallParams<'${methodSigSafe}'> & ${onComplete.type})`\n      }\n    }\n    yield DecIndent\n  }\n  if (callConfig.updateMethods.length > 0) {\n    yield* jsDoc(`A factory for available 'update' calls`)\n\n    yield `export type ${name}UpdateCalls = (typeof ${name}CallFactory)['update']`\n    yield* jsDoc('Defines supported update methods 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 `| TypedCallParams<undefined>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n\n        yield `| TypedCallParams<'${methodSigSafe}'>`\n      }\n    }\n    yield DecIndent\n  }\n\n  if (callConfig.deleteMethods.length > 0) {\n    yield* jsDoc(`A factory for available 'delete' calls`)\n\n    yield `export type ${name}DeleteCalls = (typeof ${name}CallFactory)['delete']`\n\n    yield* jsDoc('Defines supported delete methods 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 `| TypedCallParams<undefined>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n\n        yield `| TypedCallParams<'${methodSigSafe}'>`\n      }\n    }\n    yield DecIndent\n  }\n\n  yield* jsDoc('Defines arguments required for the deploy method.')\n  yield `export type ${name}DeployArgs = {`\n  yield IncIndent\n  yield `deployTimeParams?: TealTemplateParams`\n  if (callConfig.createMethods.length) {\n    yield* jsDoc('A delegate which takes a create call factory and returns the create call params for this smart contract')\n    yield `createCall?: (callFactory: ${name}CreateCalls) => ${name}CreateCallParams`\n  }\n  if (callConfig.updateMethods.length) {\n    yield* jsDoc('A delegate which takes a update call factory and returns the update call params for this smart contract')\n    yield `updateCall?: (callFactory: ${name}UpdateCalls) => ${name}UpdateCallParams`\n  }\n  if (callConfig.deleteMethods.length) {\n    yield* jsDoc('A delegate which takes a delete call factory and returns the delete call params for this smart contract')\n    yield `deleteCall?: (callFactory: ${name}DeleteCalls) => ${name}DeleteCallParams`\n  }\n  yield DecIndentAndCloseBlock\n  yield NewLine\n}\n"],"names":["BARE_CALL","OnCompleteCodeMap","jsDoc","IncIndent","DecIndent","DecIndentAndCloseBlock","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 { 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?: undefined} & ${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?: undefined}`\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?: undefined}`\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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"}

package/client/deploy-types.mjs

@@ -1,94 +1,111 @@
-import { jsDoc, IncIndent, DecIndent, DecIndentAndCloseBlock, NewLine } from '../output/writer.mjs';
+import { jsDoc, IncIndent, DecIndent, NewLine } from '../output/writer.mjs';
 import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
-import { OnCompleteCodeMap } from './utility-types.mjs';
+import { ABIMethod } from 'algosdk';
 
 function getCreateOnCompleteOptions(method, app) {
-    const callConfig = method === BARE_CALL ? app.bare_call_config : app.hints?.[method]?.call_config;
-    const hasNoOp = callConfig?.no_op === 'ALL' || callConfig?.no_op === 'CREATE';
-    const onCompleteType = callConfig
-        ? `(${Object.entries(callConfig)
-            .filter(([_, value]) => value === 'ALL' || value === 'CREATE')
-            .map(([oc]) => OnCompleteCodeMap[oc])
-            .join(' | ')})`
+    const validCreateOnCompletes = method === BARE_CALL ? app.bareActions.create : app.methods.find((m) => new 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* deployTypes({ app, callConfig, sanitizer }) {
-    const name = sanitizer.makeSafeTypeIdentifier(app.contract.name);
+function getCallOnCompleteOptions(method, app) {
+    const validCallOnCompletes = method === BARE_CALL ? app.bareActions.call : app.methods.find((m) => new 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) {
-        yield* jsDoc(`A factory for available 'create' calls`);
-        yield `export type ${name}CreateCalls = (typeof ${name}CallFactory)['create']`;
-        yield* jsDoc('Defines supported create methods for this smart contract');
+        yield* jsDoc('Defines supported create method params for this smart contract');
         yield `export type ${name}CreateCallParams =`;
         yield IncIndent;
         for (const method of callConfig.createMethods) {
             const onComplete = getCreateOnCompleteOptions(method, app);
             if (method === BARE_CALL) {
-                yield `| (TypedCallParams<undefined> & ${onComplete.type})`;
+                yield `| Expand<AppClientBareCallParams & {method?: undefined} & ${onComplete.type} & CreateSchema>`;
             }
             else {
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| (TypedCallParams<'${methodSigSafe}'> & ${onComplete.type})`;
+                const uniqueName = methodSignatureToUniqueName[method];
+                if (uniqueName !== method) {
+                    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: '${methodSigSafe}'} & ${onComplete.type} & CreateSchema>`;
             }
         }
         yield DecIndent;
     }
     if (callConfig.updateMethods.length > 0) {
-        yield* jsDoc(`A factory for available 'update' calls`);
-        yield `export type ${name}UpdateCalls = (typeof ${name}CallFactory)['update']`;
-        yield* jsDoc('Defines supported update methods for this smart contract');
+        yield* jsDoc('Defines supported update method params for this smart contract');
         yield `export type ${name}UpdateCallParams =`;
         yield IncIndent;
         for (const method of callConfig.updateMethods) {
             if (method === BARE_CALL) {
-                yield `| TypedCallParams<undefined>`;
+                yield `| Expand<AppClientBareCallParams> & {method?: undefined}`;
             }
             else {
+                const uniqueName = methodSignatureToUniqueName[method];
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| TypedCallParams<'${methodSigSafe}'>`;
+                if (uniqueName !== method) {
+                    const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
+                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
+                }
+                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`;
             }
         }
         yield DecIndent;
     }
     if (callConfig.deleteMethods.length > 0) {
-        yield* jsDoc(`A factory for available 'delete' calls`);
-        yield `export type ${name}DeleteCalls = (typeof ${name}CallFactory)['delete']`;
-        yield* jsDoc('Defines supported delete methods for this smart contract');
+        yield* jsDoc('Defines supported delete method params for this smart contract');
         yield `export type ${name}DeleteCallParams =`;
         yield IncIndent;
         for (const method of callConfig.deleteMethods) {
             if (method === BARE_CALL) {
-                yield `| TypedCallParams<undefined>`;
+                yield `| Expand<AppClientBareCallParams> & {method?: undefined}`;
             }
             else {
+                const uniqueName = methodSignatureToUniqueName[method];
                 const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method);
-                yield `| TypedCallParams<'${methodSigSafe}'>`;
+                if (uniqueName !== method) {
+                    const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName);
+                    yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`;
+                }
+                yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`;
             }
         }
         yield DecIndent;
     }
     yield* jsDoc('Defines arguments required for the deploy method.');
-    yield `export type ${name}DeployArgs = {`;
+    yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`;
     yield IncIndent;
-    yield `deployTimeParams?: TealTemplateParams`;
     if (callConfig.createMethods.length) {
-        yield* jsDoc('A delegate which takes a create call factory and returns the create call params for this smart contract');
-        yield `createCall?: (callFactory: ${name}CreateCalls) => ${name}CreateCallParams`;
+        yield* 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) {
-        yield* jsDoc('A delegate which takes a update call factory and returns the update call params for this smart contract');
-        yield `updateCall?: (callFactory: ${name}UpdateCalls) => ${name}UpdateCallParams`;
+        yield* 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) {
-        yield* jsDoc('A delegate which takes a delete call factory and returns the delete call params for this smart contract');
-        yield `deleteCall?: (callFactory: ${name}DeleteCalls) => ${name}DeleteCallParams`;
+        yield* 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`;
     }
-    yield DecIndentAndCloseBlock;
+    yield DecIndent;
+    yield `}>`;
     yield NewLine;
 }
 
-export { deployTypes, getCreateOnCompleteOptions };
+export { deployTypes, getCallOnCompleteOptions, getCreateOnCompleteOptions };
 //# sourceMappingURL=deploy-types.mjs.map