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

package/client/app-factory.mjs

@@ -0,0 +1,236 @@
+import { jsDoc, IncIndent, NewLine, DecIndentAndCloseBlock, DecIndent, indent } from '../output/writer.mjs';
+import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
+import { getCreateOnCompleteOptions } from './deploy-types.mjs';
+import { ABIMethod } from 'algosdk';
+
+function* appFactory(ctx) {
+    const { app, name } = ctx;
+    yield* jsDoc(`A factory to create and deploy one or more instance of the ${app.name} smart contract and to create one or more app clients to interact with those (or other) app instances`);
+    yield `export class ${name}Factory {`;
+    yield IncIndent;
+    yield* jsDoc(`The underlying \`AppFactory\` for when you want to have more flexibility`);
+    yield 'public readonly appFactory: AppFactory';
+    yield NewLine;
+    yield* jsDoc({
+        description: `Creates a new instance of \`${name}Factory\``,
+        params: {
+            params: 'The parameters to initialise the app factory with',
+        },
+    });
+    yield `
+    constructor(params: Expand<Omit<AppFactoryParams, 'appSpec'>>) {
+      this.appFactory = new AppFactory({
+        ...params,
+        appSpec: APP_SPEC,
+      })
+    }
+
+    /**
+     * Returns a new \`AppClient\` client for an app instance of the given ID.
+     *
+     * Automatically populates appName, defaultSender and source maps from the factory
+     * if not specified in the params.
+     * @param params The parameters to create the app client
+     * @returns The \`AppClient\`
+     */
+    public getAppClientById(params: Expand<Omit<AppClientParams, 'algorand' | 'appSpec'>>) {
+      return new ${name}Client(this.appFactory.getAppClientById(params))
+    }
+
+    /**
+     * Returns a new \`AppClient\` client, resolving the app by creator address and name
+     * using AlgoKit app deployment semantics (i.e. looking for the app creation transaction note).
+     *
+     * Automatically populates appName, defaultSender and source maps from the factory
+     * if not specified in the params.
+     * @param params The parameters to create the app client
+     * @returns The \`AppClient\`
+     */
+    public async getAppClientByCreatorAddressAndName(
+      params: Expand<Omit<AppClientParams, 'algorand' | 'appSpec' | 'appId'> & ResolveAppClientByCreatorAndName>,
+    ) {
+      return new ${name}Client(await this.appFactory.getAppClientByCreatorAddressAndName(params))
+    }
+  `;
+    yield* deployMethod(ctx);
+    yield* params(ctx);
+    yield* send(ctx);
+    yield DecIndentAndCloseBlock;
+}
+function* params(ctx) {
+    yield* jsDoc(`Get parameters to define transactions to the current app`);
+    yield `readonly params = (($this) => {`;
+    yield IncIndent;
+    yield `return {`;
+    yield IncIndent;
+    yield* paramMethods(ctx);
+    yield DecIndentAndCloseBlock;
+    yield DecIndent;
+    yield `})(this)`;
+    yield NewLine;
+}
+function* send(ctx) {
+    yield* jsDoc(`Send calls to the current app`);
+    yield `readonly send = (($this) => {`;
+    yield IncIndent;
+    yield `return {`;
+    yield IncIndent;
+    yield* createMethods(ctx);
+    yield DecIndentAndCloseBlock;
+    yield DecIndent;
+    yield `})(this)`;
+    yield NewLine;
+}
+function* createMethods(generator) {
+    const { app } = generator;
+    if (generator.callConfig.createMethods.length) {
+        yield* jsDoc(`Gets available create methods`);
+        yield `get create() {`;
+        yield IncIndent;
+        yield `return {`;
+        yield IncIndent;
+        for (const methodSig of generator.callConfig.createMethods) {
+            if (methodSig === BARE_CALL) {
+                yield* bareMethodCallParams({
+                    generator,
+                    name: 'bare',
+                    description: `Creates a new instance of the ${app.name} smart contract using a bare call`,
+                    verb: 'create',
+                    type: 'send',
+                    includeCompilation: true,
+                });
+            }
+            else {
+                const method = generator.app.methods.find((m) => new ABIMethod(m).getSignature() === methodSig);
+                yield* abiMethodCallParams({
+                    generator,
+                    method,
+                    description: `Creates a new instance of the ${app.name} smart contract using an ABI method call`,
+                    verb: 'create',
+                    type: 'send',
+                    includeCompilation: true,
+                });
+            }
+        }
+        yield DecIndentAndCloseBlock;
+        yield DecIndent;
+        yield '},';
+        yield NewLine;
+    }
+}
+function* paramMethods(ctx) {
+    const { app, callConfig } = ctx;
+    yield* operationMethods(ctx, `Creates a new instance of the ${app.name} smart contract`, callConfig.createMethods, 'create', true);
+    yield* operationMethods(ctx, `Updates an existing instance of the ${app.name} smart contract`, callConfig.updateMethods, 'deployUpdate', true);
+    yield* operationMethods(ctx, `Deletes an existing instance of the ${app.name} smart contract`, callConfig.deleteMethods, 'deployDelete');
+}
+function* bareMethodCallParams({ generator: { app, name: clientName }, name, description, verb, type, includeCompilation, }) {
+    const onComplete = verb === 'create' ? getCreateOnCompleteOptions(BARE_CALL, app) : undefined;
+    yield* jsDoc({
+        description: `${description}.`,
+        params: {
+            params: `The params for the bare (non-ABI) call`,
+        },
+        returns: type === 'params' ? `The params for a ${verb} call` : `The ${verb} result`,
+    });
+    yield `${type === 'send' ? 'async ' : ''}${name}(params?: Expand<AppClientBareCallParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${verb === 'create' ? ' & CreateSchema' : ''}${type === 'send' ? ' & ExecuteParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}>) {`;
+    if (type === 'params') {
+        yield* indent(`return $this.appFactory.params.bare.${verb}(params)`);
+    }
+    else {
+        yield* indent(`const result = await $this.appFactory.create(params)`, `return { result: result.result, app: new ${clientName}Client(result.app) }`);
+    }
+    yield '},';
+}
+function* abiMethodCallParams({ generator: { app, methodSignatureToUniqueName, name, sanitizer }, method, description, verb, type, includeCompilation, }) {
+    const methodSig = new ABIMethod(method).getSignature();
+    const uniqueName = methodSignatureToUniqueName[methodSig];
+    const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined;
+    yield* jsDoc({
+        description: `${description} using the ${methodSig} ABI method.`,
+        abiDescription: method?.desc,
+        params: {
+            params: `The params for the smart contract call`,
+        },
+        returns: `The ${verb} ${type === 'params' ? 'params' : 'result'}${method?.returns?.desc ? `: ${method.returns.desc}` : ''}`,
+    });
+    const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName);
+    const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
+    const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+    yield `${type === 'send' ? 'async ' : ''}${methodName}(params: Expand<CallParams<'${methodSigSafe}'>${includeCompilation ? ' & AppClientCompilationParams' : ''}${verb === 'create' ? ' & CreateSchema' : ''}${type === 'send' ? ' & ExecuteParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}>${onComplete?.isOptional !== false && (method.args.length === 0 || !method.args.some((a) => !a.defaultValue)) ? ` = {args: [${method.args.map((_) => 'undefined').join(', ')}]}` : ''}) {`;
+    if (type === 'params') {
+        yield* indent(`return $this.appFactory.params.${verb}(${name}ParamsFactory.${verb == 'deployDelete' ? 'delete' : verb === 'deployUpdate' ? 'update' : verb}${methodNameAccessor}(params))`);
+    }
+    else {
+        yield* indent(`const result = await $this.appFactory.create(${name}ParamsFactory.${verb}${methodNameAccessor}(params))`, `return { result: { ...result.result, return: result.result.return as undefined | MethodReturn<'${methodSigSafe}'> }, app: new ${name}Client(result.app) }`);
+    }
+    yield '},';
+}
+function* operationMethods(generator, description, methods, verb, includeCompilation) {
+    if (methods.length) {
+        yield* jsDoc(`Gets available ${verb} methods`);
+        yield `get ${verb}() {`;
+        yield IncIndent;
+        yield `return {`;
+        yield IncIndent;
+        for (const methodSig of methods) {
+            if (methodSig === BARE_CALL) {
+                yield* bareMethodCallParams({
+                    generator,
+                    name: 'bare',
+                    description: `${description} using a bare call`,
+                    verb,
+                    type: 'params',
+                    includeCompilation,
+                });
+            }
+            else {
+                const method = generator.app.methods.find((m) => new ABIMethod(m).getSignature() === methodSig);
+                yield* abiMethodCallParams({
+                    generator,
+                    method,
+                    description,
+                    verb,
+                    type: 'params',
+                    includeCompilation,
+                });
+            }
+        }
+        yield DecIndentAndCloseBlock;
+        yield DecIndent;
+        yield '},';
+        yield NewLine;
+    }
+}
+function* deployMethod(ctx) {
+    const { app, callConfig, name } = ctx;
+    yield* jsDoc({
+        description: `Idempotently deploys the ${app.name} smart contract.`,
+        params: {
+            params: 'The arguments for the contract calls and any additional parameters for the call',
+        },
+        returns: 'The deployment result',
+    });
+    yield `public async deploy(params: ${name}DeployParams = {}) {`;
+    yield IncIndent;
+    yield `const result = await this.appFactory.deploy({`;
+    yield IncIndent;
+    yield `...params,`;
+    if (callConfig.createMethods.filter((m) => m !== BARE_CALL).length) {
+        yield `createParams: params.createParams?.method ? ${name}ParamsFactory.create._resolveByMethod(params.createParams) : params.createParams,`;
+    }
+    if (callConfig.updateMethods.filter((m) => m !== BARE_CALL).length) {
+        yield `updateParams: params.updateParams?.method ? ${name}ParamsFactory.update._resolveByMethod(params.updateParams) : params.updateParams,`;
+    }
+    if (callConfig.deleteMethods.filter((m) => m !== BARE_CALL).length) {
+        yield `deleteParams: params.deleteParams?.method ? ${name}ParamsFactory.delete._resolveByMethod(params.deleteParams) : params.deleteParams,`;
+    }
+    yield DecIndent;
+    yield `})`;
+    yield `return { result: result.result, app: new ${name}Client(result.app) }`;
+    yield DecIndentAndCloseBlock;
+    yield NewLine;
+}
+
+export { appFactory };
+//# sourceMappingURL=app-factory.mjs.map

package/client/app-factory.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-factory.mjs","sources":["../../src/client/app-factory.ts"],"sourcesContent":["import { DecIndent, DecIndentAndCloseBlock, DocumentParts, IncIndent, indent, jsDoc, NewLine } from '../output/writer'\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { GeneratorContext } from './generator-context'\nimport { getCreateOnCompleteOptions } from './deploy-types'\nimport { ABIMethod } from 'algosdk'\nimport { Method } from '@algorandfoundation/algokit-utils/types/app-arc56'\n\nexport function* appFactory(ctx: GeneratorContext): DocumentParts {\n  const { app, name } = ctx\n\n  yield* jsDoc(\n    `A factory to create and deploy one or more instance of the ${app.name} smart contract and to create one or more app clients to interact with those (or other) app instances`,\n  )\n  yield `export class ${name}Factory {`\n  yield IncIndent\n  yield* jsDoc(`The underlying \\`AppFactory\\` for when you want to have more flexibility`)\n  yield 'public readonly appFactory: AppFactory'\n  yield NewLine\n\n  yield* jsDoc({\n    description: `Creates a new instance of \\`${name}Factory\\``,\n    params: {\n      params: 'The parameters to initialise the app factory with',\n    },\n  })\n\n  yield `\n    constructor(params: Expand<Omit<AppFactoryParams, 'appSpec'>>) {\n      this.appFactory = new AppFactory({\n        ...params,\n        appSpec: APP_SPEC,\n      })\n    }\n\n    /**\n     * Returns a new \\`AppClient\\` client for an app instance of the given ID.\n     *\n     * Automatically populates appName, defaultSender and source maps from the factory\n     * if not specified in the params.\n     * @param params The parameters to create the app client\n     * @returns The \\`AppClient\\`\n     */\n    public getAppClientById(params: Expand<Omit<AppClientParams, 'algorand' | 'appSpec'>>) {\n      return new ${name}Client(this.appFactory.getAppClientById(params))\n    }\n\n    /**\n     * Returns a new \\`AppClient\\` client, resolving the app by creator address and name\n     * using AlgoKit app deployment semantics (i.e. looking for the app creation transaction note).\n     *\n     * Automatically populates appName, defaultSender and source maps from the factory\n     * if not specified in the params.\n     * @param params The parameters to create the app client\n     * @returns The \\`AppClient\\`\n     */\n    public async getAppClientByCreatorAddressAndName(\n      params: Expand<Omit<AppClientParams, 'algorand' | 'appSpec' | 'appId'> & ResolveAppClientByCreatorAndName>,\n    ) {\n      return new ${name}Client(await this.appFactory.getAppClientByCreatorAddressAndName(params))\n    }\n  `\n\n  yield* deployMethod(ctx)\n  yield* params(ctx)\n  yield* send(ctx)\n  yield DecIndentAndCloseBlock\n}\n\nfunction* params(ctx: GeneratorContext): DocumentParts {\n  yield* jsDoc(`Get parameters to define transactions to the current app`)\n  yield `readonly params = (($this) => {`\n  yield IncIndent\n  yield `return {`\n  yield IncIndent\n  yield* paramMethods(ctx)\n  yield DecIndentAndCloseBlock\n  yield DecIndent\n  yield `})(this)`\n  yield NewLine\n}\n\nfunction* send(ctx: GeneratorContext): DocumentParts {\n  yield* jsDoc(`Send calls to the current app`)\n  yield `readonly send = (($this) => {`\n  yield IncIndent\n  yield `return {`\n  yield IncIndent\n  yield* createMethods(ctx)\n  yield DecIndentAndCloseBlock\n  yield DecIndent\n  yield `})(this)`\n  yield NewLine\n}\n\nfunction* createMethods(generator: GeneratorContext): DocumentParts {\n  const { app } = generator\n  if (generator.callConfig.createMethods.length) {\n    yield* jsDoc(`Gets available create methods`)\n    yield `get create() {`\n    yield IncIndent\n    yield `return {`\n    yield IncIndent\n    for (const methodSig of generator.callConfig.createMethods) {\n      if (methodSig === BARE_CALL) {\n        yield* bareMethodCallParams({\n          generator,\n          name: 'bare',\n          description: `Creates a new instance of the ${app.name} smart contract using a bare call`,\n          verb: 'create',\n          type: 'send',\n          includeCompilation: true,\n        })\n      } else {\n        const method = generator.app.methods.find((m) => new ABIMethod(m).getSignature() === methodSig)!\n        yield* abiMethodCallParams({\n          generator,\n          method,\n          description: `Creates a new instance of the ${app.name} smart contract using an ABI method call`,\n          verb: 'create',\n          type: 'send',\n          includeCompilation: true,\n        })\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndent\n    yield '},'\n    yield NewLine\n  }\n}\n\nfunction* paramMethods(ctx: GeneratorContext): DocumentParts {\n  const { app, callConfig } = ctx\n\n  yield* operationMethods(ctx, `Creates a new instance of the ${app.name} smart contract`, callConfig.createMethods, 'create', true)\n\n  yield* operationMethods(\n    ctx,\n    `Updates an existing instance of the ${app.name} smart contract`,\n    callConfig.updateMethods,\n    'deployUpdate',\n    true,\n  )\n  yield* operationMethods(ctx, `Deletes an existing instance of the ${app.name} smart contract`, callConfig.deleteMethods, 'deployDelete')\n}\n\nfunction* bareMethodCallParams({\n  generator: { app, name: clientName },\n  name,\n  description,\n  verb,\n  type,\n  includeCompilation,\n}: {\n  generator: GeneratorContext\n  name: string\n  description: string\n  verb: 'create' | 'deployUpdate' | 'deployDelete'\n  type: 'params' | 'send'\n  includeCompilation?: boolean\n}): DocumentParts {\n  const onComplete = verb === 'create' ? getCreateOnCompleteOptions(BARE_CALL, app) : undefined\n  yield* jsDoc({\n    description: `${description}.`,\n    params: {\n      params: `The params for the bare (non-ABI) call`,\n    },\n    returns: type === 'params' ? `The params for a ${verb} call` : `The ${verb} result`,\n  })\n  yield `${type === 'send' ? 'async ' : ''}${name}(params?: Expand<AppClientBareCallParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n    verb === 'create' ? ' & CreateSchema' : ''\n  }${type === 'send' ? ' & ExecuteParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}>) {`\n  if (type === 'params') {\n    yield* indent(`return $this.appFactory.params.bare.${verb}(params)`)\n  } else {\n    yield* indent(\n      `const result = await $this.appFactory.create(params)`,\n      `return { result: result.result, app: new ${clientName}Client(result.app) }`,\n    )\n  }\n  yield '},'\n}\n\nfunction* abiMethodCallParams({\n  generator: { app, methodSignatureToUniqueName, name, sanitizer },\n  method,\n  description,\n  verb,\n  type,\n  includeCompilation,\n}: {\n  generator: GeneratorContext\n  method: Method\n  description: string\n  verb: 'create' | 'deployUpdate' | 'deployDelete'\n  type: 'params' | 'send'\n  includeCompilation?: boolean\n}) {\n  const methodSig = new ABIMethod(method).getSignature()\n  const uniqueName = methodSignatureToUniqueName[methodSig]\n  const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined\n  yield* jsDoc({\n    description: `${description} using the ${methodSig} ABI method.`,\n    abiDescription: method?.desc,\n    params: {\n      params: `The params for the smart contract call`,\n    },\n    returns: `The ${verb} ${type === 'params' ? 'params' : 'result'}${method?.returns?.desc ? `: ${method.returns.desc}` : ''}`,\n  })\n  const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName)\n  const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName)\n  const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\n  yield `${type === 'send' ? 'async ' : ''}${methodName}(params: Expand<CallParams<'${methodSigSafe}'>${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n    verb === 'create' ? ' & CreateSchema' : ''\n  }${type === 'send' ? ' & ExecuteParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}>${onComplete?.isOptional !== false && (method.args.length === 0 || !method.args.some((a) => !a.defaultValue)) ? ` = {args: [${method.args.map((_) => 'undefined').join(', ')}]}` : ''}) {`\n  if (type === 'params') {\n    yield* indent(\n      `return $this.appFactory.params.${verb}(${name}ParamsFactory.${verb == 'deployDelete' ? 'delete' : verb === 'deployUpdate' ? 'update' : verb}${methodNameAccessor}(params))`,\n    )\n  } else {\n    yield* indent(\n      `const result = await $this.appFactory.create(${name}ParamsFactory.${verb}${methodNameAccessor}(params))`,\n      `return { result: { ...result.result, return: result.result.return as undefined | MethodReturn<'${methodSigSafe}'> }, app: new ${name}Client(result.app) }`,\n    )\n  }\n  yield '},'\n}\n\nfunction* operationMethods(\n  generator: GeneratorContext,\n  description: string,\n  methods: MethodList,\n  verb: 'create' | 'deployUpdate' | 'deployDelete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\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* bareMethodCallParams({\n          generator,\n          name: 'bare',\n          description: `${description} using a bare call`,\n          verb,\n          type: 'params',\n          includeCompilation,\n        })\n      } else {\n        const method = generator.app.methods.find((m) => new ABIMethod(m).getSignature() === methodSig)!\n        yield* abiMethodCallParams({\n          generator,\n          method,\n          description,\n          verb,\n          type: 'params',\n          includeCompilation,\n        })\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndent\n    yield '},'\n    yield NewLine\n  }\n}\n\nfunction* deployMethod(ctx: GeneratorContext): DocumentParts {\n  const { app, callConfig, name } = ctx\n  yield* jsDoc({\n    description: `Idempotently deploys the ${app.name} smart contract.`,\n    params: {\n      params: 'The arguments for the contract calls and any additional parameters for the call',\n    },\n    returns: 'The deployment result',\n  })\n  yield `public async deploy(params: ${name}DeployParams = {}) {`\n  yield IncIndent\n\n  yield `const result = await this.appFactory.deploy({`\n  yield IncIndent\n  yield `...params,`\n  if (callConfig.createMethods.filter((m) => m !== BARE_CALL).length) {\n    yield `createParams: params.createParams?.method ? ${name}ParamsFactory.create._resolveByMethod(params.createParams) : params.createParams,`\n  }\n  if (callConfig.updateMethods.filter((m) => m !== BARE_CALL).length) {\n    yield `updateParams: params.updateParams?.method ? ${name}ParamsFactory.update._resolveByMethod(params.updateParams) : params.updateParams,`\n  }\n  if (callConfig.deleteMethods.filter((m) => m !== BARE_CALL).length) {\n    yield `deleteParams: params.deleteParams?.method ? ${name}ParamsFactory.delete._resolveByMethod(params.deleteParams) : params.deleteParams,`\n  }\n  yield DecIndent\n  yield `})`\n  yield `return { result: result.result, app: new ${name}Client(result.app) }`\n  yield DecIndentAndCloseBlock\n  yield NewLine\n}\n"],"names":[],"mappings":"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"}

package/client/app-types.js

@@ -1,43 +1,27 @@
 'use strict';
 
 var writer = require('../output/writer.js');
-var algokit = require('@algorandfoundation/algokit-utils');
 var getEquivalentType = require('./helpers/get-equivalent-type.js');
-
-function _interopNamespaceDefault(e) {
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
-        });
-    }
-    n.default = e;
-    return Object.freeze(n);
-}
-
-var algokit__namespace = /*#__PURE__*/_interopNamespaceDefault(algokit);
+var algosdk = require('algosdk');
 
 function* appTypes(ctx) {
+    yield* abiTypes(ctx);
+    yield* structTypes(ctx);
+    yield* templateVariableTypes(ctx);
     const { app, methodSignatureToUniqueName, name } = ctx;
     yield* writer.jsDoc(`Defines the types of available calls and state of the ${name} smart contract.`);
-    yield `export type ${name} = {`;
+    yield `export type ${name}Types = {`;
     yield writer.IncIndent;
     yield* writer.jsDoc('Maps method signatures / names to their argument and return types.');
-    if (app.contract.methods.length == 0) {
+    if (app.methods.length == 0) {
         yield 'methods: {}';
     }
     else {
         yield 'methods:';
     }
     yield writer.IncIndent;
-    for (const method of app.contract.methods) {
-        const methodSig = algokit__namespace.getABIMethodSignature(method);
+    for (const method of app.methods) {
+        const methodSig = new algosdk.ABIMethod(method).getSignature();
         const methodSigSafe = ctx.sanitizer.makeSafeStringTypeLiteral(methodSig);
         const uniqueName = methodSignatureToUniqueName[methodSig];
         const uniqueNameSafe = ctx.sanitizer.makeSafeStringTypeLiteral(uniqueName);
@@ -45,10 +29,11 @@ function* appTypes(ctx) {
         yield writer.IncIndent;
         yield `argsObj: {`;
         yield writer.IncIndent;
-        const argsMeta = method.args.map((arg) => ({
+        const argsMeta = method.args.map((arg, i) => ({
             ...arg,
-            hasDefault: app.hints?.[methodSig]?.default_arguments?.[arg.name],
-            tsType: getEquivalentType.getEquivalentType(arg.type, 'input'),
+            name: arg.name ?? `arg${i + 1}`,
+            hasDefault: !!arg.defaultValue,
+            tsType: getEquivalentType.getEquivalentType(arg.struct ?? arg.type, 'input', ctx),
         }));
         for (const arg of argsMeta) {
             if (arg.desc)
@@ -57,104 +42,217 @@ function* appTypes(ctx) {
         }
         yield writer.DecIndentAndCloseBlock;
         yield* writer.inline(`argsTuple: [`, argsMeta
-            .map((arg) => `${ctx.sanitizer.makeSafeVariableIdentifier(arg.name)}: ${getEquivalentType.getEquivalentType(arg.type, 'input')}${arg.hasDefault ? ' | undefined' : ''}`)
+            .map((arg) => `${ctx.sanitizer.makeSafeVariableIdentifier(arg.name)}: ${arg.tsType}${arg.hasDefault ? ' | undefined' : ''}`)
             .join(', '), ']');
-        const outputStruct = ctx.app.hints?.[methodSig]?.structs?.output;
         if (method.returns.desc)
             yield* writer.jsDoc(method.returns.desc);
-        if (outputStruct) {
-            yield `returns: ${ctx.sanitizer.makeSafeTypeIdentifier(outputStruct.name)}`;
-        }
-        else {
-            yield `returns: ${getEquivalentType.getEquivalentType(method.returns.type ?? 'void', 'output')}`;
-        }
+        yield `returns: ${getEquivalentType.getEquivalentType(method.returns.struct ?? method.returns.type ?? 'void', 'output', ctx)}`;
         yield writer.DecIndent;
         yield '}>';
     }
     yield writer.DecIndent;
-    yield* appState(ctx);
+    const hasLocal = (app.state.keys.local && Object.keys(app.state.keys.local).length > 0) ||
+        (app.state.maps.local && Object.keys(app.state.maps.local).length > 0);
+    const hasGlobal = (app.state.keys.global && Object.keys(app.state.keys.global).length > 0) ||
+        (app.state.maps.global && Object.keys(app.state.maps.global).length > 0);
+    const hasBox = (app.state.keys.box && Object.keys(app.state.keys.box).length > 0) || (app.state.maps.box && Object.keys(app.state.maps.box).length > 0);
+    yield* appState(ctx, { hasBox, hasGlobal, hasLocal });
     yield writer.DecIndentAndCloseBlock;
-    yield* writer.jsDoc('Defines the possible abi call signatures');
-    yield `export type ${name}Sig = keyof ${name}['methods']`;
-    yield* writer.jsDoc('Defines an object containing all relevant parameters for a single call to the contract. Where TSignature is undefined, a' +
-        ' bare call is made');
-    yield `export type TypedCallParams<TSignature extends ${name}Sig | undefined> = {`;
-    yield writer.IncIndent;
-    yield 'method: TSignature';
-    yield 'methodArgs: TSignature extends undefined ? undefined : Array<ABIAppCallArg | undefined>';
-    yield writer.DecIndent;
-    yield '} & AppClientCallCoreParams & CoreAppCallArgs';
-    yield* writer.jsDoc('Defines the arguments required for a bare call');
-    yield `export type BareCallArgs = Omit<RawAppCallArgs, keyof CoreAppCallArgs>`;
-    yield* structs(ctx);
-    yield* writer.jsDoc(`Maps a method signature from the ${name} smart contract to the method's arguments in either tuple of struct form`);
-    yield `export type MethodArgs<TSignature extends ${name}Sig> = ${name}['methods'][TSignature]['argsObj' | 'argsTuple']`;
-    yield* writer.jsDoc(`Maps a method signature from the ${name} smart contract to the method's return type`);
-    yield `export type MethodReturn<TSignature extends ${name}Sig> = ${name}['methods'][TSignature]['returns']`;
+    yield writer.NewLine;
+    yield `
+  /**
+   * Defines the possible abi call signatures.
+   */
+  export type ${name}Signatures = keyof ${name}Types['methods']
+  /**
+   * Defines the possible abi call signatures for methods that return a non-void value.
+   */
+  export type ${name}NonVoidMethodSignatures = keyof ${name}Types['methods'] extends infer T ? T extends keyof ${name}Types['methods'] ? MethodReturn<T> extends void ? never : T  : never : never
+  /**
+   * Defines an object containing all relevant parameters for a single call to the contract.
+   */
+  export type CallParams<TSignature extends ${name}Signatures> = Expand<
+    Omit<AppClientMethodCallParams, 'method' | 'args' | 'onComplete'> &
+      {
+        /** The args for the ABI method call, either as an ordered array or an object */
+        args: Expand<MethodArgs<TSignature>>
+      }
+  >
+  /**
+   * Maps a method signature from the ${name} smart contract to the method's arguments in either tuple or struct form
+   */
+  export type MethodArgs<TSignature extends ${name}Signatures> = ${name}Types['methods'][TSignature]['argsObj' | 'argsTuple']
+  /**
+   * Maps a method signature from the ${name} smart contract to the method's return type
+   */
+  export type MethodReturn<TSignature extends ${name}Signatures> = ${name}Types['methods'][TSignature]['returns']
+  `;
+    if (hasGlobal) {
+        yield `
+      /**
+       * Defines the shape of the keyed global state of the application.
+       */
+      export type GlobalKeysState = ${name}Types['state']['global']['keys']
+    `;
+    }
+    if (hasLocal) {
+        yield `
+      /**
+       * Defines the shape of the keyed local state of the application.
+       */
+      export type LocalKeysState = ${name}Types['state']['local']['keys']
+    `;
+    }
+    if (hasBox) {
+        yield `
+      /**
+       * Defines the shape of the keyed box state of the application.
+       */
+      export type BoxKeysState = ${name}Types['state']['box']['keys']
+    `;
+    }
     yield writer.NewLine;
 }
-function* structs({ app, sanitizer }) {
-    if (app.hints === undefined)
+function* abiTypes(ctx) {
+    const { app } = ctx;
+    const abiTypes = [];
+    const pushType = (type) => {
+        // If we already have this type, skip
+        if (abiTypes.includes(type))
+            return;
+        // void and string are the same types in TS
+        if (['void', 'string'].includes(type))
+            return;
+        // Skip structs
+        if (app.structs[type])
+            return;
+        // If this is an array type, push the base type
+        if (type.match(/\[\d*\]$/)) {
+            pushType(type.replace(/\[\d*\]$/, ''));
+            return;
+        }
+        if (type.startsWith('(')) {
+            const tupleType = algosdk.ABITupleType.from(type);
+            tupleType.childTypes.forEach((t) => {
+                pushType(t.toString());
+            });
+            return;
+        }
+        abiTypes.push(type);
+    };
+    Object.values(app.templateVariables ?? {}).forEach((t) => {
+        pushType(t.type);
+    });
+    app.methods.forEach((m) => {
+        m.args.forEach((a) => {
+            pushType(a.type);
+        });
+        pushType(m.returns.type);
+    });
+    ['global', 'local', 'box'].forEach((storageType) => {
+        Object.values(app.state.keys[storageType]).forEach((k) => {
+            pushType(k.keyType);
+            pushType(k.valueType);
+        });
+        Object.values(app.state.maps[storageType]).forEach((m) => {
+            pushType(m.keyType);
+            pushType(m.valueType);
+        });
+    });
+    const pushStructFields = (fields) => {
+        Object.values(fields).forEach((sf) => {
+            if (typeof sf === 'string')
+                pushType(sf);
+            else
+                pushStructFields(sf);
+        });
+    };
+    Object.values(app.structs).forEach((sf) => {
+        pushStructFields(sf);
+    });
+    yield '// Aliases for non-encoded ABI values';
+    yield writer.NewLine;
+    for (const t of abiTypes) {
+        yield `type ${t} = ${getEquivalentType.getEquivalentType(t, 'output', ctx)};`;
+    }
+    yield writer.NewLine;
+}
+function* structTypes({ app, sanitizer }) {
+    if (Object.keys(app.structs).length === 0)
         return;
-    const definedStructs = new Set();
-    for (const methodHint of Object.values(app.hints)) {
-        if (methodHint.structs === undefined)
-            continue;
-        for (const struct of Object.values(methodHint.structs)) {
-            if (definedStructs.has(struct.name))
-                continue;
-            definedStructs.add(struct.name);
-            yield* writer.jsDoc(`Represents a ${struct.name} result as a struct`);
-            yield `export type ${sanitizer.makeSafeTypeIdentifier(struct.name)} = {`;
-            yield writer.IncIndent;
-            for (const [key, type] of struct.elements) {
-                yield `${sanitizer.makeSafePropertyIdentifier(key)}: ${getEquivalentType.getEquivalentType(type, 'output')}`;
+    yield '// Type definitions for ARC-56 structs';
+    yield writer.NewLine;
+    for (const structName of Object.keys(app.structs)) {
+        yield `export type ${sanitizer.makeSafeTypeIdentifier(structName)} = ${JSON.stringify(app.structs[structName], null, 2)
+            .replace(/"/g, '')
+            .replaceAll('(', '[')
+            .replaceAll(')', ']')
+            .replace(/\[\d+\]/g, '[]')}`;
+    }
+    yield writer.NewLine;
+}
+function* templateVariableTypes({ app }) {
+    if (Object.keys(app.templateVariables ?? {}).length === 0) {
+        return;
+    }
+    yield* writer.jsDoc('Deploy-time template variables');
+    yield 'export type TemplateVariables = {';
+    yield writer.IncIndent;
+    for (const name of Object.keys(app.templateVariables ?? {})) {
+        yield `${name}: ${app.templateVariables[name].type},`;
+    }
+    yield writer.DecIndentAndCloseBlock;
+}
+function* keysAndMaps(app, sanitizer, keys, maps) {
+    if (keys && Object.keys(keys).length) {
+        yield 'keys: {';
+        yield writer.IncIndent;
+        for (const name of Object.keys(keys)) {
+            const prop = keys[name];
+            if (prop.desc) {
+                yield* writer.jsDoc(prop.desc);
             }
-            yield writer.DecIndentAndCloseBlock;
-            yield* writer.jsDoc(`Converts the tuple representation of a ${struct.name} to the struct representation`);
-            yield* writer.inline(`export function ${sanitizer.makeSafeTypeIdentifier(struct.name)}(`, `[${struct.elements.map(([key]) => sanitizer.makeSafeVariableIdentifier(key)).join(', ')}]: `, `[${struct.elements.map(([_, type]) => getEquivalentType.getEquivalentType(type, 'output')).join(', ')}] ) {`);
-            yield writer.IncIndent;
-            yield `return {`;
-            yield writer.IncIndent;
-            for (const [key] of struct.elements) {
-                const prop = sanitizer.makeSafePropertyIdentifier(key);
-                const param = sanitizer.makeSafeVariableIdentifier(key);
-                yield `${prop}${prop !== param ? `: ${param}` : ''},`;
+            const keySafe = sanitizer.makeSafePropertyIdentifier(name);
+            yield `${keySafe}: ${prop.valueType === 'bytes' ? 'BinaryState' : getEquivalentType.getEquivalentType(prop.valueType, 'output', { app, sanitizer })}`;
+        }
+        yield writer.DecIndentAndCloseBlock;
+    }
+    if (maps && Object.keys(maps).length) {
+        yield 'maps: {';
+        yield writer.IncIndent;
+        for (const name of Object.keys(maps)) {
+            const prop = maps[name];
+            if (prop.desc) {
+                yield* writer.jsDoc(prop.desc);
             }
-            yield writer.DecIndentAndCloseBlock;
-            yield writer.DecIndentAndCloseBlock;
+            const keySafe = sanitizer.makeSafePropertyIdentifier(name);
+            yield `${keySafe}: Map<${getEquivalentType.getEquivalentType(prop.keyType, 'input', { app, sanitizer })}, ${getEquivalentType.getEquivalentType(prop.valueType, 'output', { app, sanitizer })}>`;
         }
+        yield writer.DecIndentAndCloseBlock;
     }
 }
-function* appState({ app, sanitizer }) {
-    const hasLocal = app.schema.local?.declared && Object.keys(app.schema.local.declared).length;
-    const hasGlobal = app.schema.global?.declared && Object.keys(app.schema.global.declared).length;
+function* appState({ app, sanitizer }, stateFlags) {
+    const { hasBox, hasGlobal, hasLocal } = stateFlags;
     if (hasLocal || hasGlobal) {
-        yield* writer.jsDoc('Defines the shape of the global and local state of the application.');
+        yield* writer.jsDoc('Defines the shape of the state of the application.');
         yield 'state: {';
         yield writer.IncIndent;
         if (hasGlobal) {
             yield 'global: {';
             yield writer.IncIndent;
-            for (const prop of Object.values(app.schema.global.declared)) {
-                if (prop.descr) {
-                    yield* writer.jsDoc(prop.descr);
-                }
-                const keySafe = sanitizer.makeSafePropertyIdentifier(prop.key);
-                yield `${keySafe}?: ${prop.type === 'uint64' ? 'IntegerState' : 'BinaryState'}`;
-            }
+            yield* keysAndMaps(app, sanitizer, app.state.keys.global, app.state.maps.global);
             yield writer.DecIndentAndCloseBlock;
         }
         if (hasLocal) {
             yield 'local: {';
             yield writer.IncIndent;
-            for (const prop of Object.values(app.schema.local.declared)) {
-                if (prop.descr) {
-                    yield* writer.jsDoc(prop.descr);
-                }
-                const keySafe = sanitizer.makeSafePropertyIdentifier(prop.key);
-                yield `${keySafe}?: ${prop.type === 'uint64' ? 'IntegerState' : 'BinaryState'}`;
-            }
+            yield* keysAndMaps(app, sanitizer, app.state.keys.local, app.state.maps.local);
+            yield writer.DecIndentAndCloseBlock;
+        }
+        if (hasBox) {
+            yield 'box: {';
+            yield writer.IncIndent;
+            yield* keysAndMaps(app, sanitizer, app.state.keys.box, app.state.maps.box);
             yield writer.DecIndentAndCloseBlock;
         }
         yield writer.DecIndentAndCloseBlock;