@algorandfoundation/algokit-client-generator 2.6.1-beta.1 → 3.0.0-beta.1

package/client/call-client.mjs

@@ -1,6 +1,5 @@
 import * as algokit from '@algorandfoundation/algokit-utils';
 import { jsDoc, IncIndent, NewLine, indent, DecIndent, inline, DecIndentAndCloseBlock } from '../output/writer.mjs';
-import { makeSafeTypeIdentifier, makeSafeMethodIdentifier } from '../util/sanitization.mjs';
 import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
 import { getCreateOnCompleteOptions } from './deploy-types.mjs';
 import { composeMethod } from './call-composer.mjs';
@@ -8,7 +7,7 @@ import { composeMethod } from './call-composer.mjs';
 function* callClient(ctx) {
     const { app, name } = ctx;
     yield* jsDoc(`A client to make calls to the ${app.contract.name} smart contract`);
-    yield `export class ${makeSafeTypeIdentifier(app.contract.name)}Client {`;
+    yield `export class ${ctx.sanitizer.makeSafeTypeIdentifier(app.contract.name)}Client {`;
     yield IncIndent;
     yield* jsDoc(`The underlying \`ApplicationClient\` for when you want to have more flexibility`);
     yield 'public readonly appClient: ApplicationClient';
@@ -16,7 +15,7 @@ function* callClient(ctx) {
     yield `private readonly sender: SendTransactionFrom | undefined`;
     yield NewLine;
     yield* jsDoc({
-        description: `Creates a new instance of \`${makeSafeTypeIdentifier(app.contract.name)}Client\``,
+        description: `Creates a new instance of \`${ctx.sanitizer.makeSafeTypeIdentifier(app.contract.name)}Client\``,
         params: {
             appDetails: 'appDetails The details to identify the app to deploy',
             algod: 'An algod client instance',
@@ -110,7 +109,7 @@ function* opMethods(ctx) {
     yield* operationMethod(ctx, `Opts the user into an existing instance of the ${app.contract.name} smart contract`, callConfig.optInMethods, 'optIn');
     yield* operationMethod(ctx, `Makes a close out call to an existing instance of the ${app.contract.name} smart contract`, callConfig.closeOutMethods, 'closeOut');
 }
-function* operationMethod({ app, methodSignatureToUniqueName, name }, description, methods, verb, includeCompilation) {
+function* operationMethod({ app, methodSignatureToUniqueName, name, sanitizer }, description, methods, verb, includeCompilation) {
     let responseTypeGenericParam;
     switch (verb) {
         case 'create':
@@ -155,8 +154,11 @@ function* operationMethod({ app, methodSignatureToUniqueName, name }, descriptio
                     },
                     returns: `The ${verb} result${method?.returns?.desc ? `: ${method.returns.desc}` : ''}`,
                 });
-                yield `async ${makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSig}'>, params: AppClientCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}${onComplete?.isOptional !== false ? ' = {}' : ''}) {`;
-                yield* indent(`return $this.mapReturnValue<MethodReturn<'${methodSig}'>${responseTypeGenericParam}>(await $this.appClient.${verb}(${name}CallFactory.${verb}.${makeSafeMethodIdentifier(uniqueName)}(args, params)))`);
+                const methodName = sanitizer.makeSafeMethodIdentifier(uniqueName);
+                const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+                yield `async ${methodName}(args: MethodArgs<'${methodSigSafe}'>, params: AppClientCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}${onComplete?.isOptional !== false ? ' = {}' : ''}) {`;
+                yield* indent(`return $this.mapReturnValue<MethodReturn<'${methodSigSafe}'>${responseTypeGenericParam}>(await $this.appClient.${verb}(${name}CallFactory.${verb}${methodNameAccessor}(args, params)))`);
                 yield '},';
             }
         }
@@ -179,10 +181,11 @@ function* clearState({ app }) {
     yield DecIndentAndCloseBlock;
     yield NewLine;
 }
-function* noopMethods({ app, name, callConfig, methodSignatureToUniqueName }) {
+function* noopMethods({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
     for (const method of app.contract.methods) {
         const methodSignature = algokit.getABIMethodSignature(method);
-        const methodName = makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodNameAccessor = sanitizer.getSafeMemberAccessor(methodName);
         // Skip methods which don't support a no_op call config
         if (!callConfig.callMethods.includes(methodSignature))
             continue;
@@ -195,16 +198,17 @@ function* noopMethods({ app, name, callConfig, methodSignatureToUniqueName }) {
             },
             returns: `The result of the call${method?.returns?.desc ? `: ${method.returns.desc}` : ''}`,
         });
-        yield `public ${methodName}(args: MethodArgs<'${methodSignature}'>, params: AppClientCallCoreParams & CoreAppCallArgs = {}) {`;
+        const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+        yield `public ${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params: AppClientCallCoreParams & CoreAppCallArgs = {}) {`;
         yield IncIndent;
         const outputTypeName = app.hints?.[methodSignature]?.structs?.output?.name;
-        yield `return this.call(${name}CallFactory.${methodName}(args, params)${outputTypeName === undefined ? '' : `, ${makeSafeTypeIdentifier(outputTypeName)}`})`;
+        yield `return this.call(${name}CallFactory${methodNameAccessor}(args, params)${outputTypeName === undefined ? '' : `, ${sanitizer.makeSafeTypeIdentifier(outputTypeName)}`})`;
         yield DecIndent;
         yield '}';
         yield NewLine;
     }
 }
-function* getStateMethods({ app, name }) {
+function* getStateMethods({ app, name, sanitizer }) {
     const globalStateValues = app.schema.global?.declared && Object.values(app.schema.global?.declared);
     const localStateValues = app.schema.local?.declared && Object.values(app.schema.local?.declared);
     if (globalStateValues?.length || localStateValues?.length) {
@@ -267,12 +271,14 @@ function* getStateMethods({ app, name }) {
         yield `return {`;
         yield IncIndent;
         for (const stateValue of globalStateValues) {
-            yield `get ${stateValue.key}() {`;
+            const stateKey = sanitizer.makeSafePropertyIdentifier(stateValue.key);
+            const stateKeyLiteral = sanitizer.makeSafeStringTypeLiteral(stateValue.key);
+            yield `get ${stateKey}() {`;
             if (stateValue.type === 'uint64') {
-                yield* indent(`return ${name}Client.getIntegerState(state, '${stateValue.key}')`);
+                yield* indent(`return ${name}Client.getIntegerState(state, '${stateKeyLiteral}')`);
             }
             else {
-                yield* indent(`return ${name}Client.getBinaryState(state, '${stateValue.key}')`);
+                yield* indent(`return ${name}Client.getBinaryState(state, '${stateKeyLiteral}')`);
             }
             yield '},';
         }
@@ -293,12 +299,14 @@ function* getStateMethods({ app, name }) {
         yield `return {`;
         yield IncIndent;
         for (const stateValue of localStateValues) {
-            yield `get ${stateValue.key}() {`;
+            const stateKey = sanitizer.makeSafePropertyIdentifier(stateValue.key);
+            const stateKeyLiteral = sanitizer.makeSafeStringTypeLiteral(stateValue.key);
+            yield `get ${stateKey}() {`;
             if (stateValue.type === 'uint64') {
-                yield* indent(`return ${name}Client.getIntegerState(state, '${stateValue.key}')`);
+                yield* indent(`return ${name}Client.getIntegerState(state, '${stateKeyLiteral}')`);
             }
             else {
-                yield* indent(`return ${name}Client.getBinaryState(state, '${stateValue.key}')`);
+                yield* indent(`return ${name}Client.getBinaryState(state, '${stateKeyLiteral}')`);
             }
             yield '},';
         }
@@ -309,3 +317,4 @@ function* getStateMethods({ app, name }) {
 }
 
 export { callClient };
+//# sourceMappingURL=call-client.mjs.map

package/client/call-client.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-client.mjs","sources":["../../src/client/call-client.ts"],"sourcesContent":["import * as algokit from '@algorandfoundation/algokit-utils'\nimport { DecIndent, DecIndentAndCloseBlock, DocumentParts, IncIndent, indent, inline, jsDoc, NewLine } from '../output/writer'\n\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { GeneratorContext } from './generator-context'\nimport { getCreateOnCompleteOptions } from './deploy-types'\nimport { composeMethod } from './call-composer'\n\nexport function* callClient(ctx: GeneratorContext): DocumentParts {\n  const { app, name } = ctx\n\n  yield* jsDoc(`A client to make calls to the ${app.contract.name} smart contract`)\n  yield `export class ${ctx.sanitizer.makeSafeTypeIdentifier(app.contract.name)}Client {`\n  yield IncIndent\n  yield* jsDoc(`The underlying \\`ApplicationClient\\` for when you want to have more flexibility`)\n  yield 'public readonly appClient: ApplicationClient'\n  yield NewLine\n  yield `private readonly sender: SendTransactionFrom | undefined`\n  yield NewLine\n\n  yield* jsDoc({\n    description: `Creates a new instance of \\`${ctx.sanitizer.makeSafeTypeIdentifier(app.contract.name)}Client\\``,\n    params: {\n      appDetails: 'appDetails The details to identify the app to deploy',\n      algod: 'An algod client instance',\n    },\n  })\n\n  yield `constructor(appDetails: AppDetails, private algod: Algodv2) {`\n  yield IncIndent\n  yield `this.sender = appDetails.sender`\n  yield 'this.appClient = algokit.getAppClient({'\n  yield* indent('...appDetails,', 'app: APP_SPEC')\n  yield '}, algod)'\n  yield DecIndent\n  yield '}'\n  yield NewLine\n\n  yield* jsDoc({\n    description: 'Checks for decode errors on the AppCallTransactionResult and maps the return value to the specified generic type',\n    params: {\n      result: 'The AppCallTransactionResult to be mapped',\n      returnValueFormatter: 'An optional delegate to format the return value if required',\n    },\n    returns: 'The smart contract response with an updated return value',\n  })\n  yield* inline(\n    `protected mapReturnValue<TReturn, TResult extends AppCallTransactionResult = AppCallTransactionResult>`,\n    `(result: AppCallTransactionResult, returnValueFormatter?: (value: any) => TReturn): `,\n    `AppCallTransactionResultOfType<TReturn> & TResult {`,\n  )\n  yield IncIndent\n  yield `if(result.return?.decodeError) {`\n  yield* indent(`throw result.return.decodeError`)\n  yield `}`\n  yield `const returnValue = result.return?.returnValue !== undefined && returnValueFormatter !== undefined`\n  yield IncIndent\n  yield `? returnValueFormatter(result.return.returnValue)`\n  yield `: result.return?.returnValue as TReturn | undefined`\n  yield `return { ...result, return: returnValue } as AppCallTransactionResultOfType<TReturn> & TResult`\n  yield DecIndent\n  yield DecIndentAndCloseBlock\n  yield NewLine\n\n  yield* jsDoc({\n    description: 'Calls the ABI method with the matching signature using an onCompletion code of NO_OP',\n    params: {\n      typedCallParams: 'An object containing the method signature, args, and any other relevant parameters',\n      returnValueFormatter: 'An optional delegate which when provided will be used to map non-undefined return values to the target type',\n    },\n    returns: 'The result of the smart contract call',\n  })\n  yield `public async call<TSignature extends keyof ${name}['methods']>(typedCallParams: TypedCallParams<TSignature>, returnValueFormatter?: (value: any) => MethodReturn<TSignature>) {`\n  yield IncIndent\n  yield `return this.mapReturnValue<MethodReturn<TSignature>>(await this.appClient.call(typedCallParams), returnValueFormatter)`\n  yield DecIndentAndCloseBlock\n  yield NewLine\n\n  yield* opMethods(ctx)\n  yield* clearState(ctx)\n  yield* noopMethods(ctx)\n  yield* getStateMethods(ctx)\n  yield* composeMethod(ctx)\n  yield DecIndentAndCloseBlock\n}\n\nfunction* opMethods(ctx: GeneratorContext): DocumentParts {\n  const { app, callConfig, name } = ctx\n\n  yield* jsDoc({\n    description: `Idempotently deploys the ${app.contract.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 deploy(params: ${name}DeployArgs & AppClientDeployCoreParams = {}): ReturnType<ApplicationClient['deploy']> {`\n  yield IncIndent\n\n  if (callConfig.createMethods.length) yield `const createArgs = params.createCall?.(${name}CallFactory.create)`\n  if (callConfig.updateMethods.length) yield `const updateArgs = params.updateCall?.(${name}CallFactory.update)`\n  if (callConfig.deleteMethods.length) yield `const deleteArgs = params.deleteCall?.(${name}CallFactory.delete)`\n\n  yield `return this.appClient.deploy({`\n  yield IncIndent\n  yield `...params,`\n  if (callConfig.updateMethods.length) yield 'updateArgs,'\n  if (callConfig.deleteMethods.length) yield 'deleteArgs,'\n  if (callConfig.createMethods.length) {\n    yield 'createArgs,'\n    yield `createOnCompleteAction: createArgs?.onCompleteAction,`\n  }\n  yield DecIndent\n  yield `})`\n  yield DecIndentAndCloseBlock\n  yield NewLine\n  yield* operationMethod(ctx, `Creates a new instance of the ${app.contract.name} smart contract`, callConfig.createMethods, 'create', true)\n  yield* operationMethod(\n    ctx,\n    `Updates an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.updateMethods,\n    'update',\n    true,\n  )\n  yield* operationMethod(ctx, `Deletes an existing instance of the ${app.contract.name} smart contract`, callConfig.deleteMethods, 'delete')\n  yield* operationMethod(\n    ctx,\n    `Opts the user into an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.optInMethods,\n    'optIn',\n  )\n  yield* operationMethod(\n    ctx,\n    `Makes a close out call to an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.closeOutMethods,\n    'closeOut',\n  )\n}\n\nfunction* operationMethod(\n  { app, methodSignatureToUniqueName, name, sanitizer }: GeneratorContext,\n  description: string,\n  methods: MethodList,\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  let responseTypeGenericParam\n  switch (verb) {\n    case 'create':\n      responseTypeGenericParam = ', AppCreateCallTransactionResult'\n      break\n    case 'update':\n      responseTypeGenericParam = ', AppUpdateCallTransactionResult'\n      break\n    default:\n      responseTypeGenericParam = ''\n      break\n  }\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\n    yield `public 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* jsDoc({\n          description: `${description} using a bare call.`,\n          params: {\n            args: `The arguments for the bare call`,\n          },\n          returns: `The ${verb} result`,\n        })\n        yield `async bare(args: BareCallArgs & AppClientCallCoreParams ${\n          includeCompilation ? '& AppClientCompilationParams ' : ''\n        }& CoreAppCallArgs${onComplete?.type ? ` & ${onComplete.type}` : ''}${onComplete?.isOptional !== false ? ' = {}' : ''}) {`\n        yield* indent(`return $this.mapReturnValue<undefined${responseTypeGenericParam}>(await $this.appClient.${verb}(args))`)\n        yield '},'\n      } else {\n        const uniqueName = methodSignatureToUniqueName[methodSig]\n        const method = app.contract.methods.find((m) => algokit.getABIMethodSignature(m) === methodSig)\n        yield* jsDoc({\n          description: `${description} using the ${methodSig} ABI method.`,\n          params: {\n            args: `The arguments for the smart contract call`,\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The ${verb} 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 `async ${methodName}(args: MethodArgs<'${methodSigSafe}'>, params: AppClientCallCoreParams${\n          includeCompilation ? ' & AppClientCompilationParams' : ''\n        }${onComplete?.type ? ` & ${onComplete.type}` : ''}${onComplete?.isOptional !== false ? ' = {}' : ''}) {`\n        yield* indent(\n          `return $this.mapReturnValue<MethodReturn<'${methodSigSafe}'>${responseTypeGenericParam}>(await $this.appClient.${verb}(${name}CallFactory.${verb}${methodNameAccessor}(args, params)))`,\n        )\n        yield '},'\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n\nfunction* clearState({ app }: GeneratorContext): DocumentParts {\n  yield* jsDoc({\n    description: `Makes a clear_state call to an existing instance of the ${app.contract.name} smart contract.`,\n    params: {\n      args: `The arguments for the bare call`,\n    },\n    returns: `The clear_state result`,\n  })\n  yield `public clearState(args: BareCallArgs & AppClientCallCoreParams & CoreAppCallArgs = {}) {`\n  yield IncIndent\n  yield `return this.appClient.clearState(args)`\n  yield DecIndentAndCloseBlock\n  yield NewLine\n}\n\nfunction* noopMethods({ app, name, 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 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({\n      description: `Calls the ${algokit.getABIMethodSignature(method)} ABI method.`,\n      abiDescription: method.desc,\n      params: {\n        args: `The arguments for the contract call`,\n        params: `Any additional parameters for the call`,\n      },\n      returns: `The result of the call${method?.returns?.desc ? `: ${method.returns.desc}` : ''}`,\n    })\n    const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature)\n    yield `public ${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params: AppClientCallCoreParams & CoreAppCallArgs = {}) {`\n    yield IncIndent\n    const outputTypeName = app.hints?.[methodSignature]?.structs?.output?.name\n    yield `return this.call(${name}CallFactory${methodNameAccessor}(args, params)${\n      outputTypeName === undefined ? '' : `, ${sanitizer.makeSafeTypeIdentifier(outputTypeName)}`\n    })`\n    yield DecIndent\n    yield '}'\n    yield NewLine\n  }\n}\n\nfunction* getStateMethods({ app, name, sanitizer }: GeneratorContext): DocumentParts {\n  const globalStateValues = app.schema.global?.declared && Object.values(app.schema.global?.declared)\n  const localStateValues = app.schema.local?.declared && Object.values(app.schema.local?.declared)\n  if (globalStateValues?.length || localStateValues?.length) {\n    yield* jsDoc({\n      description: 'Extracts a binary state value out of an AppState dictionary',\n      params: {\n        state: 'The state dictionary containing the state value',\n        key: 'The key of the state value',\n      },\n      returns: 'A BinaryState instance containing the state value, or undefined if the key was not found',\n    })\n    yield `private static getBinaryState(state: AppState, key: string): BinaryState | undefined {`\n    yield IncIndent\n    yield `const value = state[key]`\n    yield `if (!value) return undefined`\n    yield `if (!('valueRaw' in value))`\n    yield* indent(`throw new Error(\\`Failed to parse state value for \\${key}; received an int when expected a byte array\\`)`)\n    yield `return {`\n    yield IncIndent\n    yield `asString(): string {`\n    yield* indent(`return value.value`)\n    yield `},`\n    yield `asByteArray(): Uint8Array {`\n    yield* indent(`return value.valueRaw`)\n    yield `}`\n    yield DecIndentAndCloseBlock\n    yield DecIndentAndCloseBlock\n    yield NewLine\n\n    yield* jsDoc({\n      description: 'Extracts a integer state value out of an AppState dictionary',\n      params: {\n        state: 'The state dictionary containing the state value',\n        key: 'The key of the state value',\n      },\n      returns: 'An IntegerState instance containing the state value, or undefined if the key was not found',\n    })\n    yield `private static getIntegerState(state: AppState, key: string): IntegerState | undefined {`\n    yield IncIndent\n    yield `const value = state[key]`\n    yield `if (!value) return undefined`\n    yield `if ('valueRaw' in value)`\n    yield* indent(`throw new Error(\\`Failed to parse state value for \\${key}; received a byte array when expected a number\\`)`)\n    yield `return {`\n    yield IncIndent\n    yield `asBigInt() {`\n    yield* indent(`return typeof value.value === 'bigint' ? value.value : BigInt(value.value)`)\n    yield `},`\n    yield `asNumber(): number {`\n    yield* indent(`return typeof value.value === 'bigint' ? Number(value.value) : value.value`)\n    yield `},`\n    yield DecIndentAndCloseBlock\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n\n  if (globalStateValues?.length) {\n    yield* jsDoc(`Returns the smart contract's global state wrapped in a strongly typed accessor with options to format the stored value`)\n    yield `public async getGlobalState(): Promise<${name}['state']['global']> {`\n    yield IncIndent\n    yield `const state = await this.appClient.getGlobalState()`\n    yield `return {`\n    yield IncIndent\n    for (const stateValue of globalStateValues) {\n      const stateKey = sanitizer.makeSafePropertyIdentifier(stateValue.key)\n      const stateKeyLiteral = sanitizer.makeSafeStringTypeLiteral(stateValue.key)\n      yield `get ${stateKey}() {`\n      if (stateValue.type === 'uint64') {\n        yield* indent(`return ${name}Client.getIntegerState(state, '${stateKeyLiteral}')`)\n      } else {\n        yield* indent(`return ${name}Client.getBinaryState(state, '${stateKeyLiteral}')`)\n      }\n      yield '},'\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n\n  if (localStateValues?.length) {\n    yield* jsDoc({\n      description: `Returns the smart contract's local state wrapped in a strongly typed accessor with options to format the stored value`,\n      params: {\n        account: `The address of the account for which to read local state from`,\n      },\n    })\n    yield `public async getLocalState(account: string | SendTransactionFrom): Promise<${name}['state']['local']> {`\n    yield IncIndent\n    yield `const state = await this.appClient.getLocalState(account)`\n    yield `return {`\n    yield IncIndent\n    for (const stateValue of localStateValues) {\n      const stateKey = sanitizer.makeSafePropertyIdentifier(stateValue.key)\n      const stateKeyLiteral = sanitizer.makeSafeStringTypeLiteral(stateValue.key)\n      yield `get ${stateKey}() {`\n      if (stateValue.type === 'uint64') {\n        yield* indent(`return ${name}Client.getIntegerState(state, '${stateKeyLiteral}')`)\n      } else {\n        yield* indent(`return ${name}Client.getBinaryState(state, '${stateKeyLiteral}')`)\n      }\n      yield '},'\n    }\n    yield DecIndentAndCloseBlock\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n"],"names":[],"mappings":";;;;;;AAQe,UAAE,UAAU,CAAC,GAAqB,EAAA;AAC/C,IAAA,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;AAEzB,IAAA,OAAO,KAAK,CAAC,CAAiC,8BAAA,EAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAiB,eAAA,CAAA,CAAC,CAAA;AACjF,IAAA,MAAM,CAAgB,aAAA,EAAA,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAA;AACvF,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,OAAO,KAAK,CAAC,CAAA,+EAAA,CAAiF,CAAC,CAAA;AAC/F,IAAA,MAAM,8CAA8C,CAAA;AACpD,IAAA,MAAM,OAAO,CAAA;AACb,IAAA,MAAM,0DAA0D,CAAA;AAChE,IAAA,MAAM,OAAO,CAAA;IAEb,OAAO,KAAK,CAAC;AACX,QAAA,WAAW,EAAE,CAAA,4BAAA,EAA+B,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAU,QAAA,CAAA;AAC7G,QAAA,MAAM,EAAE;AACN,YAAA,UAAU,EAAE,sDAAsD;AAClE,YAAA,KAAK,EAAE,0BAA0B;AAClC,SAAA;AACF,KAAA,CAAC,CAAA;AAEF,IAAA,MAAM,+DAA+D,CAAA;AACrE,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,iCAAiC,CAAA;AACvC,IAAA,MAAM,yCAAyC,CAAA;IAC/C,OAAO,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAA;AAChD,IAAA,MAAM,WAAW,CAAA;AACjB,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,GAAG,CAAA;AACT,IAAA,MAAM,OAAO,CAAA;IAEb,OAAO,KAAK,CAAC;AACX,QAAA,WAAW,EAAE,kHAAkH;AAC/H,QAAA,MAAM,EAAE;AACN,YAAA,MAAM,EAAE,2CAA2C;AACnD,YAAA,oBAAoB,EAAE,6DAA6D;AACpF,SAAA;AACD,QAAA,OAAO,EAAE,0DAA0D;AACpE,KAAA,CAAC,CAAA;IACF,OAAO,MAAM,CACX,CAAA,sGAAA,CAAwG,EACxG,CAAsF,oFAAA,CAAA,EACtF,CAAqD,mDAAA,CAAA,CACtD,CAAA;AACD,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,kCAAkC,CAAA;AACxC,IAAA,OAAO,MAAM,CAAC,CAAA,+BAAA,CAAiC,CAAC,CAAA;AAChD,IAAA,MAAM,GAAG,CAAA;AACT,IAAA,MAAM,oGAAoG,CAAA;AAC1G,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,mDAAmD,CAAA;AACzD,IAAA,MAAM,qDAAqD,CAAA;AAC3D,IAAA,MAAM,gGAAgG,CAAA;AACtG,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,sBAAsB,CAAA;AAC5B,IAAA,MAAM,OAAO,CAAA;IAEb,OAAO,KAAK,CAAC;AACX,QAAA,WAAW,EAAE,sFAAsF;AACnG,QAAA,MAAM,EAAE;AACN,YAAA,eAAe,EAAE,oFAAoF;AACrG,YAAA,oBAAoB,EAAE,6GAA6G;AACpI,SAAA;AACD,QAAA,OAAO,EAAE,uCAAuC;AACjD,KAAA,CAAC,CAAA;IACF,MAAM,CAAA,2CAAA,EAA8C,IAAI,CAAA,6HAAA,CAA+H,CAAA;AACvL,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,wHAAwH,CAAA;AAC9H,IAAA,MAAM,sBAAsB,CAAA;AAC5B,IAAA,MAAM,OAAO,CAAA;AAEb,IAAA,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;AACrB,IAAA,OAAO,UAAU,CAAC,GAAG,CAAC,CAAA;AACtB,IAAA,OAAO,WAAW,CAAC,GAAG,CAAC,CAAA;AACvB,IAAA,OAAO,eAAe,CAAC,GAAG,CAAC,CAAA;AAC3B,IAAA,OAAO,aAAa,CAAC,GAAG,CAAC,CAAA;AACzB,IAAA,MAAM,sBAAsB,CAAA;AAC9B,CAAC;AAED,UAAU,SAAS,CAAC,GAAqB,EAAA;IACvC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;IAErC,OAAO,KAAK,CAAC;AACX,QAAA,WAAW,EAAE,CAA4B,yBAAA,EAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAkB,gBAAA,CAAA;AAC5E,QAAA,MAAM,EAAE;AACN,YAAA,MAAM,EAAE,iFAAiF;AAC1F,SAAA;AACD,QAAA,OAAO,EAAE,uBAAuB;AACjC,KAAA,CAAC,CAAA;IACF,MAAM,CAAA,sBAAA,EAAyB,IAAI,CAAA,uFAAA,CAAyF,CAAA;AAC5H,IAAA,MAAM,SAAS,CAAA;AAEf,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM;QAAE,MAAM,CAAA,uCAAA,EAA0C,IAAI,CAAA,mBAAA,CAAqB,CAAA;AAC9G,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM;QAAE,MAAM,CAAA,uCAAA,EAA0C,IAAI,CAAA,mBAAA,CAAqB,CAAA;AAC9G,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM;QAAE,MAAM,CAAA,uCAAA,EAA0C,IAAI,CAAA,mBAAA,CAAqB,CAAA;AAE9G,IAAA,MAAM,gCAAgC,CAAA;AACtC,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,YAAY,CAAA;AAClB,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM;AAAE,QAAA,MAAM,aAAa,CAAA;AACxD,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM;AAAE,QAAA,MAAM,aAAa,CAAA;AACxD,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE;AACnC,QAAA,MAAM,aAAa,CAAA;AACnB,QAAA,MAAM,uDAAuD,CAAA;KAC9D;AACD,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,IAAI,CAAA;AACV,IAAA,MAAM,sBAAsB,CAAA;AAC5B,IAAA,MAAM,OAAO,CAAA;IACb,OAAO,eAAe,CAAC,GAAG,EAAE,CAAA,8BAAA,EAAiC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAiB,eAAA,CAAA,EAAE,UAAU,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC1I,OAAO,eAAe,CACpB,GAAG,EACH,CAAA,oCAAA,EAAuC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAiB,eAAA,CAAA,EACzE,UAAU,CAAC,aAAa,EACxB,QAAQ,EACR,IAAI,CACL,CAAA;IACD,OAAO,eAAe,CAAC,GAAG,EAAE,CAAA,oCAAA,EAAuC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAA,eAAA,CAAiB,EAAE,UAAU,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;IAC1I,OAAO,eAAe,CACpB,GAAG,EACH,CAAA,+CAAA,EAAkD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAA,eAAA,CAAiB,EACpF,UAAU,CAAC,YAAY,EACvB,OAAO,CACR,CAAA;IACD,OAAO,eAAe,CACpB,GAAG,EACH,CAAA,sDAAA,EAAyD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAA,eAAA,CAAiB,EAC3F,UAAU,CAAC,eAAe,EAC1B,UAAU,CACX,CAAA;AACH,CAAC;AAED,UAAU,eAAe,CACvB,EAAE,GAAG,EAAE,2BAA2B,EAAE,IAAI,EAAE,SAAS,EAAoB,EACvE,WAAmB,EACnB,OAAmB,EACnB,IAA2D,EAC3D,kBAA4B,EAAA;AAE5B,IAAA,IAAI,wBAAwB,CAAA;IAC5B,QAAQ,IAAI;AACV,QAAA,KAAK,QAAQ;YACX,wBAAwB,GAAG,kCAAkC,CAAA;YAC7D,MAAK;AACP,QAAA,KAAK,QAAQ;YACX,wBAAwB,GAAG,kCAAkC,CAAA;YAC7D,MAAK;AACP,QAAA;YACE,wBAAwB,GAAG,EAAE,CAAA;YAC7B,MAAK;KACR;AACD,IAAA,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO,KAAK,CAAC,kBAAkB,IAAI,CAAA,QAAA,CAAU,CAAC,CAAA;QAC9C,MAAM,CAAA,WAAA,EAAc,IAAI,CAAA,IAAA,CAAM,CAAA;AAC9B,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,oBAAoB,CAAA;AAC1B,QAAA,MAAM,UAAU,CAAA;AAChB,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;AAC/B,YAAA,MAAM,UAAU,GAAG,IAAI,KAAK,QAAQ,GAAG,0BAA0B,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;AAC7F,YAAA,IAAI,SAAS,KAAK,SAAS,EAAE;gBAC3B,OAAO,KAAK,CAAC;oBACX,WAAW,EAAE,CAAG,EAAA,WAAW,CAAqB,mBAAA,CAAA;AAChD,oBAAA,MAAM,EAAE;AACN,wBAAA,IAAI,EAAE,CAAiC,+BAAA,CAAA;AACxC,qBAAA;oBACD,OAAO,EAAE,CAAO,IAAA,EAAA,IAAI,CAAS,OAAA,CAAA;AAC9B,iBAAA,CAAC,CAAA;AACF,gBAAA,MAAM,2DACJ,kBAAkB,GAAG,+BAA+B,GAAG,EACzD,CAAA,iBAAA,EAAoB,UAAU,EAAE,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,CAAA,CAAE,GAAG,EAAE,CAAG,EAAA,UAAU,EAAE,UAAU,KAAK,KAAK,GAAG,OAAO,GAAG,EAAE,KAAK,CAAA;gBAC1H,OAAO,MAAM,CAAC,CAAA,qCAAA,EAAwC,wBAAwB,CAA2B,wBAAA,EAAA,IAAI,CAAS,OAAA,CAAA,CAAC,CAAA;AACvH,gBAAA,MAAM,IAAI,CAAA;aACX;iBAAM;AACL,gBAAA,MAAM,UAAU,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAA;gBACzD,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAA;gBAC/F,OAAO,KAAK,CAAC;AACX,oBAAA,WAAW,EAAE,CAAA,EAAG,WAAW,CAAA,WAAA,EAAc,SAAS,CAAc,YAAA,CAAA;AAChE,oBAAA,MAAM,EAAE;AACN,wBAAA,IAAI,EAAE,CAA2C,yCAAA,CAAA;AACjD,wBAAA,MAAM,EAAE,CAAwC,sCAAA,CAAA;AACjD,qBAAA;oBACD,OAAO,EAAE,OAAO,IAAI,CAAA,OAAA,EAAU,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,CAAK,EAAA,EAAA,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAE,CAAA;AACxF,iBAAA,CAAC,CAAA;gBACF,MAAM,UAAU,GAAG,SAAS,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAA;gBACjE,MAAM,kBAAkB,GAAG,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAA;gBACtE,MAAM,aAAa,GAAG,SAAS,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAA;gBACpE,MAAM,CAAA,MAAA,EAAS,UAAU,CAAsB,mBAAA,EAAA,aAAa,sCAC1D,kBAAkB,GAAG,+BAA+B,GAAG,EACzD,CAAG,EAAA,UAAU,EAAE,IAAI,GAAG,CAAA,GAAA,EAAM,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAA,EAAG,UAAU,EAAE,UAAU,KAAK,KAAK,GAAG,OAAO,GAAG,EAAE,CAAA,GAAA,CAAK,CAAA;AACzG,gBAAA,OAAO,MAAM,CACX,CAA6C,0CAAA,EAAA,aAAa,KAAK,wBAAwB,CAAA,wBAAA,EAA2B,IAAI,CAAA,CAAA,EAAI,IAAI,CAAe,YAAA,EAAA,IAAI,GAAG,kBAAkB,CAAA,gBAAA,CAAkB,CACzL,CAAA;AACD,gBAAA,MAAM,IAAI,CAAA;aACX;SACF;AACD,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,OAAO,CAAA;KACd;AACH,CAAC;AAED,UAAU,UAAU,CAAC,EAAE,GAAG,EAAoB,EAAA;IAC5C,OAAO,KAAK,CAAC;AACX,QAAA,WAAW,EAAE,CAA2D,wDAAA,EAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAkB,gBAAA,CAAA;AAC3G,QAAA,MAAM,EAAE;AACN,YAAA,IAAI,EAAE,CAAiC,+BAAA,CAAA;AACxC,SAAA;AACD,QAAA,OAAO,EAAE,CAAwB,sBAAA,CAAA;AAClC,KAAA,CAAC,CAAA;AACF,IAAA,MAAM,0FAA0F,CAAA;AAChG,IAAA,MAAM,SAAS,CAAA;AACf,IAAA,MAAM,wCAAwC,CAAA;AAC9C,IAAA,MAAM,sBAAsB,CAAA;AAC5B,IAAA,MAAM,OAAO,CAAA;AACf,CAAC;AAED,UAAU,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,2BAA2B,EAAE,SAAS,EAAoB,EAAA;IACvG,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE;QACzC,MAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,UAAU,GAAG,SAAS,CAAC,wBAAwB,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC,CAAA;QACnG,MAAM,kBAAkB,GAAG,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAA;;QAEtE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC;YAAE,SAAQ;QAC/D,OAAO,KAAK,CAAC;YACX,WAAW,EAAE,aAAa,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAc,YAAA,CAAA;YAC7E,cAAc,EAAE,MAAM,CAAC,IAAI;AAC3B,YAAA,MAAM,EAAE;AACN,gBAAA,IAAI,EAAE,CAAqC,mCAAA,CAAA;AAC3C,gBAAA,MAAM,EAAE,CAAwC,sCAAA,CAAA;AACjD,aAAA;YACD,OAAO,EAAE,yBAAyB,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,KAAK,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAE,CAAA;AAC5F,SAAA,CAAC,CAAA;QACF,MAAM,mBAAmB,GAAG,SAAS,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAA;AAChF,QAAA,MAAM,CAAU,OAAA,EAAA,UAAU,CAAsB,mBAAA,EAAA,mBAAmB,+DAA+D,CAAA;AAClI,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,cAAc,GAAG,GAAG,CAAC,KAAK,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAA;QAC1E,MAAM,CAAA,iBAAA,EAAoB,IAAI,CAAA,WAAA,EAAc,kBAAkB,CAAA,cAAA,EAC5D,cAAc,KAAK,SAAS,GAAG,EAAE,GAAG,CAAK,EAAA,EAAA,SAAS,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC3F,CAAA,CAAA,CAAA,CAAG,CAAA;AACH,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,GAAG,CAAA;AACT,QAAA,MAAM,OAAO,CAAA;KACd;AACH,CAAC;AAED,UAAU,eAAe,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAoB,EAAA;IAClE,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACnG,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAChG,IAAI,iBAAiB,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,EAAE;QACzD,OAAO,KAAK,CAAC;AACX,YAAA,WAAW,EAAE,6DAA6D;AAC1E,YAAA,MAAM,EAAE;AACN,gBAAA,KAAK,EAAE,iDAAiD;AACxD,gBAAA,GAAG,EAAE,4BAA4B;AAClC,aAAA;AACD,YAAA,OAAO,EAAE,0FAA0F;AACpG,SAAA,CAAC,CAAA;AACF,QAAA,MAAM,wFAAwF,CAAA;AAC9F,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,0BAA0B,CAAA;AAChC,QAAA,MAAM,8BAA8B,CAAA;AACpC,QAAA,MAAM,6BAA6B,CAAA;AACnC,QAAA,OAAO,MAAM,CAAC,CAAA,wGAAA,CAA0G,CAAC,CAAA;AACzH,QAAA,MAAM,UAAU,CAAA;AAChB,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,OAAO,MAAM,CAAC,CAAA,kBAAA,CAAoB,CAAC,CAAA;AACnC,QAAA,MAAM,IAAI,CAAA;AACV,QAAA,MAAM,6BAA6B,CAAA;AACnC,QAAA,OAAO,MAAM,CAAC,CAAA,qBAAA,CAAuB,CAAC,CAAA;AACtC,QAAA,MAAM,GAAG,CAAA;AACT,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,OAAO,CAAA;QAEb,OAAO,KAAK,CAAC;AACX,YAAA,WAAW,EAAE,8DAA8D;AAC3E,YAAA,MAAM,EAAE;AACN,gBAAA,KAAK,EAAE,iDAAiD;AACxD,gBAAA,GAAG,EAAE,4BAA4B;AAClC,aAAA;AACD,YAAA,OAAO,EAAE,4FAA4F;AACtG,SAAA,CAAC,CAAA;AACF,QAAA,MAAM,0FAA0F,CAAA;AAChG,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,0BAA0B,CAAA;AAChC,QAAA,MAAM,8BAA8B,CAAA;AACpC,QAAA,MAAM,0BAA0B,CAAA;AAChC,QAAA,OAAO,MAAM,CAAC,CAAA,0GAAA,CAA4G,CAAC,CAAA;AAC3H,QAAA,MAAM,UAAU,CAAA;AAChB,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,cAAc,CAAA;AACpB,QAAA,OAAO,MAAM,CAAC,CAAA,0EAAA,CAA4E,CAAC,CAAA;AAC3F,QAAA,MAAM,IAAI,CAAA;AACV,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,OAAO,MAAM,CAAC,CAAA,0EAAA,CAA4E,CAAC,CAAA;AAC3F,QAAA,MAAM,IAAI,CAAA;AACV,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,OAAO,CAAA;KACd;AAED,IAAA,IAAI,iBAAiB,EAAE,MAAM,EAAE;AAC7B,QAAA,OAAO,KAAK,CAAC,CAAA,sHAAA,CAAwH,CAAC,CAAA;QACtI,MAAM,CAAA,uCAAA,EAA0C,IAAI,CAAA,sBAAA,CAAwB,CAAA;AAC5E,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,qDAAqD,CAAA;AAC3D,QAAA,MAAM,UAAU,CAAA;AAChB,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;YAC1C,MAAM,QAAQ,GAAG,SAAS,CAAC,0BAA0B,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,eAAe,GAAG,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YAC3E,MAAM,CAAA,IAAA,EAAO,QAAQ,CAAA,IAAA,CAAM,CAAA;AAC3B,YAAA,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAChC,OAAO,MAAM,CAAC,CAAA,OAAA,EAAU,IAAI,CAAkC,+BAAA,EAAA,eAAe,CAAI,EAAA,CAAA,CAAC,CAAA;aACnF;iBAAM;gBACL,OAAO,MAAM,CAAC,CAAA,OAAA,EAAU,IAAI,CAAiC,8BAAA,EAAA,eAAe,CAAI,EAAA,CAAA,CAAC,CAAA;aAClF;AACD,YAAA,MAAM,IAAI,CAAA;SACX;AACD,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,OAAO,CAAA;KACd;AAED,IAAA,IAAI,gBAAgB,EAAE,MAAM,EAAE;QAC5B,OAAO,KAAK,CAAC;AACX,YAAA,WAAW,EAAE,CAAuH,qHAAA,CAAA;AACpI,YAAA,MAAM,EAAE;AACN,gBAAA,OAAO,EAAE,CAA+D,6DAAA,CAAA;AACzE,aAAA;AACF,SAAA,CAAC,CAAA;QACF,MAAM,CAAA,2EAAA,EAA8E,IAAI,CAAA,qBAAA,CAAuB,CAAA;AAC/G,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,MAAM,2DAA2D,CAAA;AACjE,QAAA,MAAM,UAAU,CAAA;AAChB,QAAA,MAAM,SAAS,CAAA;AACf,QAAA,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;YACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,0BAA0B,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,eAAe,GAAG,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YAC3E,MAAM,CAAA,IAAA,EAAO,QAAQ,CAAA,IAAA,CAAM,CAAA;AAC3B,YAAA,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAChC,OAAO,MAAM,CAAC,CAAA,OAAA,EAAU,IAAI,CAAkC,+BAAA,EAAA,eAAe,CAAI,EAAA,CAAA,CAAC,CAAA;aACnF;iBAAM;gBACL,OAAO,MAAM,CAAC,CAAA,OAAA,EAAU,IAAI,CAAiC,8BAAA,EAAA,eAAe,CAAI,EAAA,CAAA,CAAC,CAAA;aAClF;AACD,YAAA,MAAM,IAAI,CAAA;SACX;AACD,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,sBAAsB,CAAA;AAC5B,QAAA,MAAM,OAAO,CAAA;KACd;AACH;;;;"}

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

@@ -1,10 +1,9 @@
 'use strict';
 
-var writer = require('../output/writer.cjs');
+var writer = require('../output/writer.js');
 var algokit = require('@algorandfoundation/algokit-utils');
-var sanitization = require('../util/sanitization.cjs');
-var getCallConfigSummary = require('./helpers/get-call-config-summary.cjs');
-var deployTypes = require('./deploy-types.cjs');
+var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
+var deployTypes = require('./deploy-types.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -83,10 +82,11 @@ function* callComposerTypeClearState({ app, name }) {
     yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, undefined]>`;
     yield writer.NewLine;
 }
-function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName }) {
+function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
     for (const method of app.contract.methods) {
         const methodSignature = algokit__namespace.getABIMethodSignature(method);
-        const methodName = sanitization.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
         // Skip methods which don't support a no_op call config
         if (!callConfig.callMethods.includes(methodSignature))
             continue;
@@ -99,11 +99,11 @@ function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUnique
             },
             returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
         });
-        yield `${methodName}(args: MethodArgs<'${methodSignature}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignature}'>]>`;
+        yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignatureSafe}'>]>`;
         yield writer.NewLine;
     }
 }
-function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name }, description, methods, verb, includeCompilation) {
+function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name, sanitizer }, description, methods, verb, includeCompilation) {
     if (methods.length) {
         yield* writer.jsDoc(`Gets available ${verb} methods`);
         yield `readonly ${verb}: {`;
@@ -130,7 +130,8 @@ function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, na
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                yield `${sanitization.makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSig}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, MethodReturn<'${methodSig}'>]>`;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSigSafe}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, MethodReturn<'${methodSigSafe}'>]>`;
             }
         }
         yield writer.DecIndentAndCloseBlock;
@@ -139,3 +140,4 @@ function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, na
 }
 
 exports.callComposerType = callComposerType;
+//# sourceMappingURL=call-composer-types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer-types.js","sources":["../../src/client/call-composer-types.ts"],"sourcesContent":["import { DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport * as algokit from '@algorandfoundation/algokit-utils'\n\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { getCreateOnCompleteOptions } from './deploy-types'\n\nexport function* callComposerType(ctx: GeneratorContext): DocumentParts {\n  const { name, callConfig, app } = ctx\n  yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`\n  yield IncIndent\n\n  yield* callComposerTypeNoops(ctx)\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Updates an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.updateMethods,\n    'update',\n    true,\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Deletes an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.deleteMethods,\n    'delete',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Opts the user into an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.optInMethods,\n    'optIn',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Makes a close out call to an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.closeOutMethods,\n    'closeOut',\n  )\n\n  yield* callComposerTypeClearState(ctx)\n\n  yield* jsDoc({\n    description: 'Adds a transaction to the composer',\n    params: {\n      txn: 'One of: A TransactionWithSigner object (returned as is), a TransactionToSign object (signer is obtained from the signer property), a Transaction object (signer is extracted from the defaultSender parameter), an async SendTransactionResult returned by one of algokit utils helpers (signer is obtained from the defaultSender parameter)',\n      defaultSender:\n        'The default sender to be used to obtain a signer where the object provided to the transaction parameter does not' +\n        ' include a signer.',\n    },\n  })\n  yield `addTransaction(txn: TransactionWithSigner | TransactionToSign | Transaction | Promise<SendTransactionResult>, defaultSender?: SendTransactionFrom): ${name}Composer<TReturns>`\n\n  yield* jsDoc({\n    description: 'Returns the underlying AtomicTransactionComposer instance',\n  })\n  yield `atc(): Promise<AtomicTransactionComposer>`\n\n  yield* jsDoc({\n    description: 'Simulates the transaction group and returns the result',\n  })\n  yield `simulate(options?: SimulateOptions): Promise<${name}ComposerSimulateResult<TReturns>>`\n\n  yield* jsDoc({\n    description: 'Executes the transaction group and returns the results',\n  })\n  yield `execute(sendParams?: AppClientComposeExecuteParams): Promise<${name}ComposerResults<TReturns>>`\n\n  yield DecIndentAndCloseBlock\n  yield `export type SimulateOptions = Omit<ConstructorParameters<typeof modelsv2.SimulateRequest>[0], 'txnGroups'>`\n\n  yield `export type ${name}ComposerSimulateResult<TReturns extends [...any[]]> = {`\n  yield IncIndent\n  yield `returns: TReturns`\n  yield `methodResults: ABIResult[]`\n  yield `simulateResponse: modelsv2.SimulateResponse`\n  yield DecIndentAndCloseBlock\n\n  yield `export type ${name}ComposerResults<TReturns extends [...any[]]> = {`\n  yield IncIndent\n  yield `returns: TReturns`\n  yield `groupId: string`\n  yield `txIds: string[]`\n  yield `transactions: Transaction[]`\n  yield DecIndentAndCloseBlock\n}\n\nfunction* callComposerTypeClearState({ app, name }: GeneratorContext): DocumentParts {\n  yield* jsDoc({\n    description: `Makes a clear_state call to an existing instance of the ${app.contract.name} smart contract.`,\n    params: {\n      args: `The arguments for the bare call`,\n    },\n    returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n  })\n  yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, undefined]>`\n  yield NewLine\n}\n\nfunction* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }: GeneratorContext): DocumentParts {\n  for (const method of app.contract.methods) {\n    const methodSignature = algokit.getABIMethodSignature(method)\n    const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature)\n    const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature])\n    // Skip methods which don't support a no_op call config\n    if (!callConfig.callMethods.includes(methodSignature)) continue\n    yield* jsDoc({\n      description: `Calls the ${algokit.getABIMethodSignature(method)} ABI method.`,\n      abiDescription: method.desc,\n      params: {\n        args: `The arguments for the contract call`,\n        params: `Any additional parameters for the call`,\n      },\n      returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n    })\n    yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignatureSafe}'>]>`\n    yield NewLine\n  }\n}\n\nfunction* callComposerOperationMethodType(\n  { app, methodSignatureToUniqueName, name, sanitizer }: GeneratorContext,\n  description: string,\n  methods: MethodList,\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\n    yield `readonly ${verb}: {`\n    yield IncIndent\n    for (const methodSig of methods) {\n      const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined\n      if (methodSig === BARE_CALL) {\n        yield* jsDoc({\n          description: `${description} using a bare call.`,\n          params: {\n            args: `The arguments for the bare call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        yield `bare(args${onComplete?.isOptional !== false ? '?' : ''}: BareCallArgs & AppClientComposeCallCoreParams ${\n          includeCompilation ? '& AppClientCompilationParams ' : ''\n        }& CoreAppCallArgs${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, undefined]>`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[methodSig]\n        yield* jsDoc({\n          description: `${description} using the ${methodSig} ABI method.`,\n          params: {\n            args: `The arguments for the smart contract call`,\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\n        yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSigSafe}'>, params${\n          onComplete?.isOptional !== false ? '?' : ''\n        }: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n          onComplete?.type ? ` & ${onComplete.type}` : ''\n        }): ${name}Composer<[...TReturns, MethodReturn<'${methodSigSafe}'>]>`\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n"],"names":["IncIndent","jsDoc","DecIndentAndCloseBlock","NewLine","algokit","getCreateOnCompleteOptions","BARE_CALL"],"mappings":"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"}

package/client/call-composer-types.mjs

@@ -1,6 +1,5 @@
 import { IncIndent, jsDoc, DecIndentAndCloseBlock, NewLine } from '../output/writer.mjs';
 import * as algokit from '@algorandfoundation/algokit-utils';
-import { makeSafeMethodIdentifier } from '../util/sanitization.mjs';
 import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
 import { getCreateOnCompleteOptions } from './deploy-types.mjs';
 
@@ -62,10 +61,11 @@ function* callComposerTypeClearState({ app, name }) {
     yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, undefined]>`;
     yield NewLine;
 }
-function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName }) {
+function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }) {
     for (const method of app.contract.methods) {
         const methodSignature = algokit.getABIMethodSignature(method);
-        const methodName = makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature);
+        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
         // Skip methods which don't support a no_op call config
         if (!callConfig.callMethods.includes(methodSignature))
             continue;
@@ -78,11 +78,11 @@ function* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUnique
             },
             returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
         });
-        yield `${methodName}(args: MethodArgs<'${methodSignature}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignature}'>]>`;
+        yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignatureSafe}'>]>`;
         yield NewLine;
     }
 }
-function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name }, description, methods, verb, includeCompilation) {
+function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, name, sanitizer }, description, methods, verb, includeCompilation) {
     if (methods.length) {
         yield* jsDoc(`Gets available ${verb} methods`);
         yield `readonly ${verb}: {`;
@@ -109,7 +109,8 @@ function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, na
                     },
                     returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,
                 });
-                yield `${makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSig}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, MethodReturn<'${methodSig}'>]>`;
+                const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig);
+                yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSigSafe}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, MethodReturn<'${methodSigSafe}'>]>`;
             }
         }
         yield DecIndentAndCloseBlock;
@@ -118,3 +119,4 @@ function* callComposerOperationMethodType({ app, methodSignatureToUniqueName, na
 }
 
 export { callComposerType };
+//# sourceMappingURL=call-composer-types.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer-types.mjs","sources":["../../src/client/call-composer-types.ts"],"sourcesContent":["import { DecIndentAndCloseBlock, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport * as algokit from '@algorandfoundation/algokit-utils'\n\nimport { BARE_CALL, MethodList } from './helpers/get-call-config-summary'\nimport { getCreateOnCompleteOptions } from './deploy-types'\n\nexport function* callComposerType(ctx: GeneratorContext): DocumentParts {\n  const { name, callConfig, app } = ctx\n  yield `export type ${name}Composer<TReturns extends [...any[]] = []> = {`\n  yield IncIndent\n\n  yield* callComposerTypeNoops(ctx)\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Updates an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.updateMethods,\n    'update',\n    true,\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Deletes an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.deleteMethods,\n    'delete',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Opts the user into an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.optInMethods,\n    'optIn',\n  )\n  yield* callComposerOperationMethodType(\n    ctx,\n    `Makes a close out call to an existing instance of the ${app.contract.name} smart contract`,\n    callConfig.closeOutMethods,\n    'closeOut',\n  )\n\n  yield* callComposerTypeClearState(ctx)\n\n  yield* jsDoc({\n    description: 'Adds a transaction to the composer',\n    params: {\n      txn: 'One of: A TransactionWithSigner object (returned as is), a TransactionToSign object (signer is obtained from the signer property), a Transaction object (signer is extracted from the defaultSender parameter), an async SendTransactionResult returned by one of algokit utils helpers (signer is obtained from the defaultSender parameter)',\n      defaultSender:\n        'The default sender to be used to obtain a signer where the object provided to the transaction parameter does not' +\n        ' include a signer.',\n    },\n  })\n  yield `addTransaction(txn: TransactionWithSigner | TransactionToSign | Transaction | Promise<SendTransactionResult>, defaultSender?: SendTransactionFrom): ${name}Composer<TReturns>`\n\n  yield* jsDoc({\n    description: 'Returns the underlying AtomicTransactionComposer instance',\n  })\n  yield `atc(): Promise<AtomicTransactionComposer>`\n\n  yield* jsDoc({\n    description: 'Simulates the transaction group and returns the result',\n  })\n  yield `simulate(options?: SimulateOptions): Promise<${name}ComposerSimulateResult<TReturns>>`\n\n  yield* jsDoc({\n    description: 'Executes the transaction group and returns the results',\n  })\n  yield `execute(sendParams?: AppClientComposeExecuteParams): Promise<${name}ComposerResults<TReturns>>`\n\n  yield DecIndentAndCloseBlock\n  yield `export type SimulateOptions = Omit<ConstructorParameters<typeof modelsv2.SimulateRequest>[0], 'txnGroups'>`\n\n  yield `export type ${name}ComposerSimulateResult<TReturns extends [...any[]]> = {`\n  yield IncIndent\n  yield `returns: TReturns`\n  yield `methodResults: ABIResult[]`\n  yield `simulateResponse: modelsv2.SimulateResponse`\n  yield DecIndentAndCloseBlock\n\n  yield `export type ${name}ComposerResults<TReturns extends [...any[]]> = {`\n  yield IncIndent\n  yield `returns: TReturns`\n  yield `groupId: string`\n  yield `txIds: string[]`\n  yield `transactions: Transaction[]`\n  yield DecIndentAndCloseBlock\n}\n\nfunction* callComposerTypeClearState({ app, name }: GeneratorContext): DocumentParts {\n  yield* jsDoc({\n    description: `Makes a clear_state call to an existing instance of the ${app.contract.name} smart contract.`,\n    params: {\n      args: `The arguments for the bare call`,\n    },\n    returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n  })\n  yield `clearState(args?: BareCallArgs & AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, undefined]>`\n  yield NewLine\n}\n\nfunction* callComposerTypeNoops({ app, name, callConfig, methodSignatureToUniqueName, sanitizer }: GeneratorContext): DocumentParts {\n  for (const method of app.contract.methods) {\n    const methodSignature = algokit.getABIMethodSignature(method)\n    const methodSignatureSafe = sanitizer.makeSafeStringTypeLiteral(methodSignature)\n    const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature])\n    // Skip methods which don't support a no_op call config\n    if (!callConfig.callMethods.includes(methodSignature)) continue\n    yield* jsDoc({\n      description: `Calls the ${algokit.getABIMethodSignature(method)} ABI method.`,\n      abiDescription: method.desc,\n      params: {\n        args: `The arguments for the contract call`,\n        params: `Any additional parameters for the call`,\n      },\n      returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n    })\n    yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs): ${name}Composer<[...TReturns, MethodReturn<'${methodSignatureSafe}'>]>`\n    yield NewLine\n  }\n}\n\nfunction* callComposerOperationMethodType(\n  { app, methodSignatureToUniqueName, name, sanitizer }: GeneratorContext,\n  description: string,\n  methods: MethodList,\n  verb: 'create' | 'update' | 'optIn' | 'closeOut' | 'delete',\n  includeCompilation?: boolean,\n): DocumentParts {\n  if (methods.length) {\n    yield* jsDoc(`Gets available ${verb} methods`)\n    yield `readonly ${verb}: {`\n    yield IncIndent\n    for (const methodSig of methods) {\n      const onComplete = verb === 'create' ? getCreateOnCompleteOptions(methodSig, app) : undefined\n      if (methodSig === BARE_CALL) {\n        yield* jsDoc({\n          description: `${description} using a bare call.`,\n          params: {\n            args: `The arguments for the bare call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        yield `bare(args${onComplete?.isOptional !== false ? '?' : ''}: BareCallArgs & AppClientComposeCallCoreParams ${\n          includeCompilation ? '& AppClientCompilationParams ' : ''\n        }& CoreAppCallArgs${onComplete?.type ? ` & ${onComplete.type}` : ''}): ${name}Composer<[...TReturns, undefined]>`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[methodSig]\n        yield* jsDoc({\n          description: `${description} using the ${methodSig} ABI method.`,\n          params: {\n            args: `The arguments for the smart contract call`,\n            params: `Any additional parameters for the call`,\n          },\n          returns: `The typed transaction composer so you can fluently chain multiple calls or call execute to execute all queued up transactions`,\n        })\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(methodSig)\n        yield `${sanitizer.makeSafeMethodIdentifier(uniqueName)}(args: MethodArgs<'${methodSigSafe}'>, params${\n          onComplete?.isOptional !== false ? '?' : ''\n        }: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${\n          onComplete?.type ? ` & ${onComplete.type}` : ''\n        }): ${name}Composer<[...TReturns, MethodReturn<'${methodSigSafe}'>]>`\n      }\n    }\n    yield DecIndentAndCloseBlock\n    yield NewLine\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,9 @@
 'use strict';
 
-var writer = require('../output/writer.cjs');
+var writer = require('../output/writer.js');
 var algokit = require('@algorandfoundation/algokit-utils');
-var sanitization = require('../util/sanitization.cjs');
-var getCallConfigSummary = require('./helpers/get-call-config-summary.cjs');
-var deployTypes = require('./deploy-types.cjs');
+var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
+var deployTypes = require('./deploy-types.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -79,16 +78,18 @@ function* composeMethod(ctx) {
     yield `} as unknown as ${name}Composer`;
     yield writer.DecIndentAndCloseBlock;
 }
-function* callComposerNoops({ app, callConfig, methodSignatureToUniqueName }) {
+function* callComposerNoops({ app, callConfig, methodSignatureToUniqueName, sanitizer }) {
     for (const method of app.contract.methods) {
         const methodSignature = algokit__namespace.getABIMethodSignature(method);
-        const methodName = sanitization.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodSignatureSafe = 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<'${methodSignature}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
+        yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
         yield writer.IncIndent;
-        yield `promiseChain = promiseChain.then(() => client.${methodName}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
+        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 `return this`;
@@ -105,7 +106,7 @@ function* callComposerClearState() {
     yield writer.DecIndent;
     yield '},';
 }
-function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, methods, verb, includeCompilation) {
+function* callComposerOperationMethods({ app, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
     if (methods.length) {
         yield `get ${verb}() {`;
         yield writer.IncIndent;
@@ -125,10 +126,12 @@ function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, met
             }
             else {
                 const uniqueName = methodSignatureToUniqueName[methodSig];
-                const methodName = sanitization.makeSafeMethodIdentifier(uniqueName);
-                yield `${methodName}(args: MethodArgs<'${methodSig}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}) {`;
+                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 writer.IncIndent;
-                yield `promiseChain = promiseChain.then(() => client.${verb}.${methodName}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
+                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`;
@@ -143,3 +146,4 @@ function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, met
 }
 
 exports.composeMethod = composeMethod;
+//# sourceMappingURL=call-composer.js.map

package/client/call-composer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call-composer.js","sources":["../../src/client/call-composer.ts"],"sourcesContent":["import { DecIndent, DecIndentAndCloseBlock, DocumentParts, IncIndent } 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":["IncIndent","DecIndent","DecIndentAndCloseBlock","algokit","getCreateOnCompleteOptions","BARE_CALL"],"mappings":"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"}

package/client/call-composer.mjs

@@ -1,6 +1,5 @@
 import { IncIndent, DecIndent, DecIndentAndCloseBlock } from '../output/writer.mjs';
 import * as algokit from '@algorandfoundation/algokit-utils';
-import { makeSafeMethodIdentifier } from '../util/sanitization.mjs';
 import { BARE_CALL } from './helpers/get-call-config-summary.mjs';
 import { getCreateOnCompleteOptions } from './deploy-types.mjs';
 
@@ -58,16 +57,18 @@ function* composeMethod(ctx) {
     yield `} as unknown as ${name}Composer`;
     yield DecIndentAndCloseBlock;
 }
-function* callComposerNoops({ app, callConfig, methodSignatureToUniqueName }) {
+function* callComposerNoops({ app, callConfig, methodSignatureToUniqueName, sanitizer }) {
     for (const method of app.contract.methods) {
         const methodSignature = algokit.getABIMethodSignature(method);
-        const methodName = makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodName = sanitizer.makeSafeMethodIdentifier(methodSignatureToUniqueName[methodSignature]);
+        const methodSignatureSafe = 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<'${methodSignature}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
+        yield `${methodName}(args: MethodArgs<'${methodSignatureSafe}'>, params?: AppClientComposeCallCoreParams & CoreAppCallArgs) {`;
         yield IncIndent;
-        yield `promiseChain = promiseChain.then(() => client.${methodName}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
+        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 `return this`;
@@ -84,7 +85,7 @@ function* callComposerClearState() {
     yield DecIndent;
     yield '},';
 }
-function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, methods, verb, includeCompilation) {
+function* callComposerOperationMethods({ app, methodSignatureToUniqueName, sanitizer }, methods, verb, includeCompilation) {
     if (methods.length) {
         yield `get ${verb}() {`;
         yield IncIndent;
@@ -104,10 +105,12 @@ function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, met
             }
             else {
                 const uniqueName = methodSignatureToUniqueName[methodSig];
-                const methodName = makeSafeMethodIdentifier(uniqueName);
-                yield `${methodName}(args: MethodArgs<'${methodSig}'>, params${onComplete?.isOptional !== false ? '?' : ''}: AppClientComposeCallCoreParams${includeCompilation ? ' & AppClientCompilationParams' : ''}${onComplete?.type ? ` & ${onComplete.type}` : ''}) {`;
+                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 IncIndent;
-                yield `promiseChain = promiseChain.then(() => client.${verb}.${methodName}(args, {...params, sendParams: {...params?.sendParams, skipSending: true, atc}}))`;
+                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`;
@@ -122,3 +125,4 @@ function* callComposerOperationMethods({ app, methodSignatureToUniqueName }, met
 }
 
 export { composeMethod };
+//# sourceMappingURL=call-composer.mjs.map

package/client/call-composer.mjs.map

@@ -0,0 +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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"}