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

package/client/deploy-types.mjs

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

package/client/deploy-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-types.mjs","sources":["../../src/client/deploy-types.ts"],"sourcesContent":["import { DecIndent, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { BARE_CALL, MethodIdentifier } from './helpers/get-call-config-summary'\nimport { GeneratorContext } from './generator-context'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { ABIMethod } from 'algosdk'\n\nexport function getCreateOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract) {\n  const validCreateOnCompletes =\n    method === BARE_CALL ? app.bareActions.create : app.methods.find((m) => new ABIMethod(m).getSignature() === method)?.actions?.create\n  const hasNoOp = validCreateOnCompletes?.includes('NoOp')\n  const onCompleteType = validCreateOnCompletes\n    ? `{onComplete${hasNoOp ? '?' : ''}: ${validCreateOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`\n    : {}\n  return {\n    type: onCompleteType,\n    isOptional: hasNoOp,\n  }\n}\n\nexport function getCallOnCompleteOptions(method: MethodIdentifier, app: Arc56Contract) {\n  const validCallOnCompletes =\n    method === BARE_CALL ? app.bareActions.call : app.methods.find((m) => new ABIMethod(m).getSignature() === method)?.actions?.call\n  const hasNoOp = validCallOnCompletes?.includes('NoOp')\n  const onCompleteType = validCallOnCompletes\n    ? `{onComplete${hasNoOp ? '?' : ''}: ${validCallOnCompletes.map((oc) => `OnApplicationComplete.${oc}OC`).join(' | ')}}`\n    : {}\n  return {\n    type: onCompleteType,\n    isOptional: hasNoOp,\n  }\n}\n\nexport function* deployTypes({ app, callConfig, sanitizer, methodSignatureToUniqueName }: GeneratorContext): DocumentParts {\n  const name = sanitizer.makeSafeTypeIdentifier(app.name)\n\n  if (callConfig.createMethods.length > 0) {\n    yield* jsDoc('Defines supported create method params for this smart contract')\n    yield `export type ${name}CreateCallParams =`\n    yield IncIndent\n    for (const method of callConfig.createMethods) {\n      const onComplete = getCreateOnCompleteOptions(method, app)\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.type} & CreateSchema>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        const uniqueName = methodSignatureToUniqueName[method]\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.type} & CreateSchema>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.type} & CreateSchema>`\n      }\n    }\n    yield DecIndent\n  }\n  if (callConfig.updateMethods.length > 0) {\n    yield* jsDoc('Defines supported update method params for this smart contract')\n    yield `export type ${name}UpdateCallParams =`\n    yield IncIndent\n    for (const method of callConfig.updateMethods) {\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[method]\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  if (callConfig.deleteMethods.length > 0) {\n    yield* jsDoc('Defines supported delete method params for this smart contract')\n    yield `export type ${name}DeleteCallParams =`\n    yield IncIndent\n    for (const method of callConfig.deleteMethods) {\n      if (method === BARE_CALL) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = methodSignatureToUniqueName[method]\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method)\n        if (uniqueName !== method) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  yield* jsDoc('Defines arguments required for the deploy method.')\n  yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`\n  yield IncIndent\n  if (callConfig.createMethods.length) {\n    yield* jsDoc(\n      'Create transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `createParams?: ${name}CreateCallParams`\n  }\n  if (callConfig.updateMethods.length) {\n    yield* jsDoc(\n      'Update transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `updateParams?: ${name}UpdateCallParams`\n  }\n  if (callConfig.deleteMethods.length) {\n    yield* jsDoc(\n      'Delete transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `deleteParams?: ${name}DeleteCallParams`\n  }\n  yield DecIndent\n  yield `}>`\n  yield NewLine\n}\n"],"names":[],"mappings":";;;;AAMM,SAAU,0BAA0B,CAAC,MAAwB,EAAE,GAAkB,EAAA;AACrF,IAAA,MAAM,sBAAsB,GAC1B,MAAM,KAAK,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM;IACtI,MAAM,OAAO,GAAG,sBAAsB,EAAE,QAAQ,CAAC,MAAM,CAAC;IACxD,MAAM,cAAc,GAAG;AACrB,UAAE,CAAA,WAAA,EAAc,OAAO,GAAG,GAAG,GAAG,EAAE,CAAA,EAAA,EAAK,sBAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAA,sBAAA,EAAyB,EAAE,CAAA,EAAA,CAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA,CAAA;UACpH,EAAE;IACN,OAAO;AACL,QAAA,IAAI,EAAE,cAAc;AACpB,QAAA,UAAU,EAAE,OAAO;KACpB;AACH;AAEM,SAAU,wBAAwB,CAAC,MAAwB,EAAE,GAAkB,EAAA;AACnF,IAAA,MAAM,oBAAoB,GACxB,MAAM,KAAK,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI;IAClI,MAAM,OAAO,GAAG,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC;IACtD,MAAM,cAAc,GAAG;AACrB,UAAE,CAAA,WAAA,EAAc,OAAO,GAAG,GAAG,GAAG,EAAE,CAAA,EAAA,EAAK,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAA,sBAAA,EAAyB,EAAE,CAAA,EAAA,CAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA,CAAA;UAClH,EAAE;IACN,OAAO;AACL,QAAA,IAAI,EAAE,cAAc;AACpB,QAAA,UAAU,EAAE,OAAO;KACpB;AACH;AAEM,UAAW,WAAW,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,2BAA2B,EAAoB,EAAA;IACxG,MAAM,IAAI,GAAG,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC;IAEvD,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;AACvC,QAAA,OAAO,KAAK,CAAC,gEAAgE,CAAC;QAC9E,MAAM,CAAA,YAAA,EAAe,IAAI,CAAA,kBAAA,CAAoB;AAC7C,QAAA,MAAM,SAAS;AACf,QAAA,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,aAAa,EAAE;YAC7C,MAAM,UAAU,GAAG,0BAA0B,CAAC,MAAM,EAAE,GAAG,CAAC;AAC1D,YAAA,IAAI,MAAM,KAAK,SAAS,EAAE;AACxB,gBAAA,MAAM,CAAA,sDAAA,EAAyD,UAAU,CAAC,IAAI,kBAAkB;YAClG;iBAAO;gBACL,MAAM,aAAa,GAAG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC;AACjE,gBAAA,MAAM,UAAU,GAAG,2BAA2B,CAAC,MAAM,CAAC;AACtD,gBAAA,IAAI,UAAU,KAAK,MAAM,EAAE;oBACzB,MAAM,UAAU,GAAG,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC;AAClE,oBAAA,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,QAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,UAAU,CAAA,KAAA,EAAQ,UAAU,CAAC,IAAI,kBAAkB;gBACjL;AACA,gBAAA,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,QAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,aAAa,CAAA,KAAA,EAAQ,UAAU,CAAC,IAAI,kBAAkB;YACpL;QACF;AACA,QAAA,MAAM,SAAS;IACjB;IACA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;AACvC,QAAA,OAAO,KAAK,CAAC,gEAAgE,CAAC;QAC9E,MAAM,CAAA,YAAA,EAAe,IAAI,CAAA,kBAAA,CAAoB;AAC7C,QAAA,MAAM,SAAS;AACf,QAAA,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,aAAa,EAAE;AAC7C,YAAA,IAAI,MAAM,KAAK,SAAS,EAAE;AACxB,gBAAA,MAAM,sDAAsD;YAC9D;iBAAO;AACL,gBAAA,MAAM,UAAU,GAAG,2BAA2B,CAAC,MAAM,CAAC;gBACtD,MAAM,aAAa,GAAG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC;AACjE,gBAAA,IAAI,UAAU,KAAK,MAAM,EAAE;oBACzB,MAAM,UAAU,GAAG,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC;oBAClE,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,CAAA,KAAA,EAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,UAAU,CAAA,GAAA,CAAK;gBAC7I;gBACA,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,CAAA,KAAA,EAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,aAAa,CAAA,GAAA,CAAK;YAChJ;QACF;AACA,QAAA,MAAM,SAAS;IACjB;IAEA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;AACvC,QAAA,OAAO,KAAK,CAAC,gEAAgE,CAAC;QAC9E,MAAM,CAAA,YAAA,EAAe,IAAI,CAAA,kBAAA,CAAoB;AAC7C,QAAA,MAAM,SAAS;AACf,QAAA,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,aAAa,EAAE;AAC7C,YAAA,IAAI,MAAM,KAAK,SAAS,EAAE;AACxB,gBAAA,MAAM,sDAAsD;YAC9D;iBAAO;AACL,gBAAA,MAAM,UAAU,GAAG,2BAA2B,CAAC,MAAM,CAAC;gBACtD,MAAM,aAAa,GAAG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC;AACjE,gBAAA,IAAI,UAAU,KAAK,MAAM,EAAE;oBACzB,MAAM,UAAU,GAAG,SAAS,CAAC,yBAAyB,CAAC,UAAU,CAAC;oBAClE,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,CAAA,KAAA,EAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,UAAU,CAAA,GAAA,CAAK;gBAC7I;gBACA,MAAM,CAAA,oBAAA,EAAuB,IAAI,CAAA,aAAA,EAAgB,aAAa,CAAA,KAAA,EAAQ,IAAI,CAAA,eAAA,EAAkB,aAAa,CAAA,gBAAA,EAAmB,aAAa,CAAA,GAAA,CAAK;YAChJ;QACF;AACA,QAAA,MAAM,SAAS;IACjB;AAEA,IAAA,OAAO,KAAK,CAAC,mDAAmD,CAAC;IACjE,MAAM,CAAA,YAAA,EAAe,IAAI,CAAA,wGAAA,CAA0G;AACnI,IAAA,MAAM,SAAS;AACf,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE;AACnC,QAAA,OAAO,KAAK,CACV,uLAAuL,CACxL;QACD,MAAM,CAAA,eAAA,EAAkB,IAAI,CAAA,gBAAA,CAAkB;IAChD;AACA,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE;AACnC,QAAA,OAAO,KAAK,CACV,uLAAuL,CACxL;QACD,MAAM,CAAA,eAAA,EAAkB,IAAI,CAAA,gBAAA,CAAkB;IAChD;AACA,IAAA,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE;AACnC,QAAA,OAAO,KAAK,CACV,uLAAuL,CACxL;QACD,MAAM,CAAA,eAAA,EAAkB,IAAI,CAAA,gBAAA,CAAkB;IAChD;AACA,IAAA,MAAM,SAAS;AACf,IAAA,MAAM,IAAI;AACV,IAAA,MAAM,OAAO;AACf;;;;"}
+{"version":3,"file":"deploy-types.mjs","sources":["../../src/client/deploy-types.ts"],"sourcesContent":["import { DecIndent, DocumentParts, IncIndent, jsDoc, NewLine } from '../output/writer'\nimport { GeneratorContext } from './generator-context'\nimport { isAbiMethod } from './app-client-context'\n\nexport function* deployTypes({ app, sanitizer }: GeneratorContext): DocumentParts {\n  const name = app.name.makeSafeTypeIdentifier\n\n  if (app.createMethods.length) {\n    yield* jsDoc('Defines supported create method params for this smart contract')\n    yield `export type ${name}CreateCallParams =`\n    yield IncIndent\n\n    for (const method of app.createMethods) {\n      const onComplete = method.createActions.inputType\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams & {method?: never} & ${onComplete.typeLiteral} & CreateSchema>`\n      } else {\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        const uniqueName = method.uniqueName.original\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'} & ${onComplete.typeLiteral} & CreateSchema>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'} & ${onComplete.typeLiteral} & CreateSchema>`\n      }\n    }\n    yield DecIndent\n  }\n  if (app.updateMethods.length) {\n    yield* jsDoc('Defines supported update method params for this smart contract')\n    yield `export type ${name}UpdateCallParams =`\n    yield IncIndent\n\n    for (const method of app.updateMethods) {\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = method.uniqueName.original\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  if (app.deleteMethods.length) {\n    yield* jsDoc('Defines supported delete method params for this smart contract')\n    yield `export type ${name}DeleteCallParams =`\n    yield IncIndent\n    for (const method of app.deleteMethods) {\n      if (!isAbiMethod(method)) {\n        yield `| Expand<AppClientBareCallParams> & {method?: never}`\n      } else {\n        const uniqueName = method.uniqueName.original\n        const methodSigSafe = sanitizer.makeSafeStringTypeLiteral(method.signature)\n        if (uniqueName !== method.signature) {\n          const methodName = sanitizer.makeSafeStringTypeLiteral(uniqueName)\n          yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodName}'}>`\n        }\n        yield `| Expand<CallParams<${name}Args['obj']['${methodSigSafe}'] | ${name}Args['tuple']['${methodSigSafe}']> & {method: '${methodSigSafe}'}>`\n      }\n    }\n    yield DecIndent\n  }\n\n  yield* jsDoc('Defines arguments required for the deploy method.')\n  yield `export type ${name}DeployParams = Expand<Omit<AppFactoryDeployParams, 'createParams' | 'updateParams' | 'deleteParams'> & {`\n  yield IncIndent\n  if (app.createMethods.length) {\n    yield* jsDoc(\n      'Create transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `createParams?: ${name}CreateCallParams`\n  }\n  if (app.updateMethods.length) {\n    yield* jsDoc(\n      'Update transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `updateParams?: ${name}UpdateCallParams`\n  }\n  if (app.deleteMethods.length) {\n    yield* jsDoc(\n      'Delete transaction parameters to use if a create needs to be issued as part of deployment; use `method` to define ABI call (if available) or leave out for a bare call (if available)',\n    )\n    yield `deleteParams?: ${name}DeleteCallParams`\n  }\n  yield DecIndent\n  yield `}>`\n  yield NewLine\n}\n"],"names":[],"mappings":"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"}

package/client/generate.d.ts

@@ -1,4 +1,4 @@
 import { DocumentParts } from '../output/writer';
 import { GeneratorOptions } from './generator-context';
-import { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56';
+import { Arc56Contract } from '@algorandfoundation/algokit-utils/abi';
 export declare function generate(app: Arc56Contract, options?: Partial<GeneratorOptions>): DocumentParts;

package/client/generate.js

@@ -70,9 +70,9 @@ function* generate(app, options) {
     yield `/**`;
     yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`;
     yield ` * DO NOT MODIFY IT BY HAND.`;
-    yield ` * requires: @algorandfoundation/algokit-utils: ^7`;
+    yield ` * requires: @algorandfoundation/algokit-utils: ^10`;
     yield ` */`;
-    yield* imports.imports(ctx);
+    yield* imports.imports();
     // Change the structs definition to sanitize property names according to the defined rules
     // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp
     reduceAppSpec.structs = Object.fromEntries(Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]));

package/client/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sources":["../../src/client/generate.ts"],"sourcesContent":["import { DocumentParts, inline, NewLine } from '../output/writer'\nimport { paramsFactory } from './params-factory'\nimport { appClient } from './app-client'\nimport { deployTypes } from './deploy-types'\nimport { utilityTypes } from './utility-types'\nimport { imports } from './imports'\nimport { createGeneratorContext, GeneratorOptions } from './generator-context'\nimport { appTypes } from './app-types'\nimport { callComposerType } from './call-composer-types'\nimport { Arc56Contract, ProgramSourceInfo, StructField } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { appFactory } from './app-factory'\nimport { Sanitizer } from '../util/sanitization'\n\nfunction convertStructs(s: StructField[], sanitizer: Sanitizer): StructField[] {\n  return s.map(\n    ({ name, type }) =>\n      ({\n        name: sanitizer.makeSafePropertyIdentifier(name),\n        type: typeof type === 'string' ? type : convertStructs(type, sanitizer),\n      }) satisfies StructField,\n  )\n}\n\nfunction shrinkAppSpec(app: Arc56Contract, options: GeneratorOptions): Arc56Contract {\n  const strippedAppSpec = structuredClone(app)\n\n  // Only keep the source info if it is needed for error mapping\n  const shrinkSourceInfo = (sourceInfo: ProgramSourceInfo['sourceInfo']) => {\n    return sourceInfo\n      .filter((entry) => entry.errorMessage)\n      .map((entry) => ({\n        pc: entry.pc,\n        errorMessage: entry.errorMessage,\n        // Keep minimal context for error mapping if available\n        ...(entry.teal !== undefined && { teal: entry.teal }),\n      }))\n  }\n\n  // Keep only source info entries that can be used for approval and clear program error mapping\n  if (strippedAppSpec.sourceInfo?.approval?.sourceInfo && strippedAppSpec.sourceInfo.approval.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.approval.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.approval.sourceInfo)\n  }\n\n  if (strippedAppSpec.sourceInfo?.clear?.sourceInfo && strippedAppSpec.sourceInfo.clear.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.clear.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.clear.sourceInfo)\n  }\n\n  if (strippedAppSpec.compilerInfo) {\n    delete strippedAppSpec.compilerInfo\n  }\n\n  // These are used for deploying but not for calling deployed apps\n  if (options.mode === 'minimal') {\n    if (strippedAppSpec.source) {\n      delete strippedAppSpec.source\n    }\n    if (strippedAppSpec.byteCode) {\n      delete strippedAppSpec.byteCode\n    }\n    if (strippedAppSpec.templateVariables) {\n      delete strippedAppSpec.templateVariables\n    }\n    if (strippedAppSpec.scratchVariables) {\n      delete strippedAppSpec.scratchVariables\n    }\n  }\n  return strippedAppSpec\n}\n\nexport function* generate(app: Arc56Contract, options?: Partial<GeneratorOptions>): DocumentParts {\n  const resolvedOptions: GeneratorOptions = {\n    // Set defaults\n    preserveNames: false,\n    mode: 'full',\n    ...options,\n  }\n  const reduceAppSpec = shrinkAppSpec(app, resolvedOptions)\n\n  const ctx = createGeneratorContext(reduceAppSpec, resolvedOptions)\n  yield `/* eslint-disable */`\n  yield `/**`\n  yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`\n  yield ` * DO NOT MODIFY IT BY HAND.`\n  yield ` * requires: @algorandfoundation/algokit-utils: ^7`\n  yield ` */`\n\n  yield* imports(ctx)\n  // Change the structs definition to sanitize property names according to the defined rules\n  // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp\n  reduceAppSpec.structs = Object.fromEntries(\n    Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]),\n  )\n  yield* inline('export const APP_SPEC: Arc56Contract = ', JSON.stringify(reduceAppSpec), ' as unknown as Arc56Contract')\n  yield NewLine\n\n  yield* utilityTypes()\n  yield NewLine\n  yield* appTypes(ctx)\n\n  if (ctx.mode === 'full') {\n    yield* deployTypes(ctx)\n  }\n  yield NewLine\n\n  // Write a call factory\n  yield* paramsFactory(ctx)\n  yield NewLine\n  // Write a factory in full mode\n  if (ctx.mode === 'full') {\n    yield* appFactory(ctx)\n  }\n  // Write a client\n  yield* appClient(ctx)\n\n  yield* callComposerType(ctx)\n}\n"],"names":["createGeneratorContext","imports","inline","NewLine","utilityTypes","appTypes","deployTypes","paramsFactory","appFactory","appClient","callComposerType"],"mappings":"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"}
+{"version":3,"file":"generate.js","sources":["../../src/client/generate.ts"],"sourcesContent":["import { DocumentParts, inline, NewLine } from '../output/writer'\nimport { paramsFactory } from './params-factory'\nimport { appClient } from './app-client'\nimport { deployTypes } from './deploy-types'\nimport { utilityTypes } from './utility-types'\nimport { imports } from './imports'\nimport { createGeneratorContext, GeneratorOptions } from './generator-context'\nimport { appTypes } from './app-types'\nimport { callComposerType } from './call-composer-types'\nimport { Arc56Contract, ProgramSourceInfo, StructField } from '@algorandfoundation/algokit-utils/abi'\nimport { appFactory } from './app-factory'\nimport { Sanitizer } from '../util/sanitization'\n\nfunction convertStructs(s: StructField[], sanitizer: Sanitizer): StructField[] {\n  return s.map(\n    ({ name, type }) =>\n      ({\n        name: sanitizer.makeSafePropertyIdentifier(name),\n        type: typeof type === 'string' ? type : convertStructs(type, sanitizer),\n      }) satisfies StructField,\n  )\n}\n\nfunction shrinkAppSpec(app: Arc56Contract, options: GeneratorOptions): Arc56Contract {\n  const strippedAppSpec = structuredClone(app)\n\n  // Only keep the source info if it is needed for error mapping\n  const shrinkSourceInfo = (sourceInfo: ProgramSourceInfo['sourceInfo']) => {\n    return sourceInfo\n      .filter((entry) => entry.errorMessage)\n      .map((entry) => ({\n        pc: entry.pc,\n        errorMessage: entry.errorMessage,\n        // Keep minimal context for error mapping if available\n        ...(entry.teal !== undefined && { teal: entry.teal }),\n      }))\n  }\n\n  // Keep only source info entries that can be used for approval and clear program error mapping\n  if (strippedAppSpec.sourceInfo?.approval?.sourceInfo && strippedAppSpec.sourceInfo.approval.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.approval.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.approval.sourceInfo)\n  }\n\n  if (strippedAppSpec.sourceInfo?.clear?.sourceInfo && strippedAppSpec.sourceInfo.clear.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.clear.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.clear.sourceInfo)\n  }\n\n  if (strippedAppSpec.compilerInfo) {\n    delete strippedAppSpec.compilerInfo\n  }\n\n  // These are used for deploying but not for calling deployed apps\n  if (options.mode === 'minimal') {\n    if (strippedAppSpec.source) {\n      delete strippedAppSpec.source\n    }\n    if (strippedAppSpec.byteCode) {\n      delete strippedAppSpec.byteCode\n    }\n    if (strippedAppSpec.templateVariables) {\n      delete strippedAppSpec.templateVariables\n    }\n    if (strippedAppSpec.scratchVariables) {\n      delete strippedAppSpec.scratchVariables\n    }\n  }\n  return strippedAppSpec\n}\n\nexport function* generate(app: Arc56Contract, options?: Partial<GeneratorOptions>): DocumentParts {\n  const resolvedOptions: GeneratorOptions = {\n    // Set defaults\n    preserveNames: false,\n    mode: 'full',\n    ...options,\n  }\n  const reduceAppSpec = shrinkAppSpec(app, resolvedOptions)\n\n  const ctx = createGeneratorContext(reduceAppSpec, resolvedOptions)\n  yield `/* eslint-disable */`\n  yield `/**`\n  yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`\n  yield ` * DO NOT MODIFY IT BY HAND.`\n  yield ` * requires: @algorandfoundation/algokit-utils: ^10`\n  yield ` */`\n\n  yield* imports()\n  // Change the structs definition to sanitize property names according to the defined rules\n  // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp\n  reduceAppSpec.structs = Object.fromEntries(\n    Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]),\n  )\n  yield* inline('export const APP_SPEC: Arc56Contract = ', JSON.stringify(reduceAppSpec), ' as unknown as Arc56Contract')\n  yield NewLine\n\n  yield* utilityTypes()\n  yield NewLine\n  yield* appTypes(ctx)\n\n  if (ctx.mode === 'full') {\n    yield* deployTypes(ctx)\n  }\n  yield NewLine\n\n  // Write a call factory\n  yield* paramsFactory(ctx)\n  yield NewLine\n  // Write a factory in full mode\n  if (ctx.mode === 'full') {\n    yield* appFactory(ctx)\n  }\n  // Write a client\n  yield* appClient(ctx)\n\n  yield* callComposerType(ctx)\n}\n"],"names":["createGeneratorContext","imports","inline","NewLine","utilityTypes","appTypes","deployTypes","paramsFactory","appFactory","appClient","callComposerType"],"mappings":"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"}

package/client/generate.mjs

@@ -68,9 +68,9 @@ function* generate(app, options) {
     yield `/**`;
     yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`;
     yield ` * DO NOT MODIFY IT BY HAND.`;
-    yield ` * requires: @algorandfoundation/algokit-utils: ^7`;
+    yield ` * requires: @algorandfoundation/algokit-utils: ^10`;
     yield ` */`;
-    yield* imports(ctx);
+    yield* imports();
     // Change the structs definition to sanitize property names according to the defined rules
     // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp
     reduceAppSpec.structs = Object.fromEntries(Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]));

package/client/generate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generate.mjs","sources":["../../src/client/generate.ts"],"sourcesContent":["import { DocumentParts, inline, NewLine } from '../output/writer'\nimport { paramsFactory } from './params-factory'\nimport { appClient } from './app-client'\nimport { deployTypes } from './deploy-types'\nimport { utilityTypes } from './utility-types'\nimport { imports } from './imports'\nimport { createGeneratorContext, GeneratorOptions } from './generator-context'\nimport { appTypes } from './app-types'\nimport { callComposerType } from './call-composer-types'\nimport { Arc56Contract, ProgramSourceInfo, StructField } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { appFactory } from './app-factory'\nimport { Sanitizer } from '../util/sanitization'\n\nfunction convertStructs(s: StructField[], sanitizer: Sanitizer): StructField[] {\n  return s.map(\n    ({ name, type }) =>\n      ({\n        name: sanitizer.makeSafePropertyIdentifier(name),\n        type: typeof type === 'string' ? type : convertStructs(type, sanitizer),\n      }) satisfies StructField,\n  )\n}\n\nfunction shrinkAppSpec(app: Arc56Contract, options: GeneratorOptions): Arc56Contract {\n  const strippedAppSpec = structuredClone(app)\n\n  // Only keep the source info if it is needed for error mapping\n  const shrinkSourceInfo = (sourceInfo: ProgramSourceInfo['sourceInfo']) => {\n    return sourceInfo\n      .filter((entry) => entry.errorMessage)\n      .map((entry) => ({\n        pc: entry.pc,\n        errorMessage: entry.errorMessage,\n        // Keep minimal context for error mapping if available\n        ...(entry.teal !== undefined && { teal: entry.teal }),\n      }))\n  }\n\n  // Keep only source info entries that can be used for approval and clear program error mapping\n  if (strippedAppSpec.sourceInfo?.approval?.sourceInfo && strippedAppSpec.sourceInfo.approval.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.approval.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.approval.sourceInfo)\n  }\n\n  if (strippedAppSpec.sourceInfo?.clear?.sourceInfo && strippedAppSpec.sourceInfo.clear.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.clear.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.clear.sourceInfo)\n  }\n\n  if (strippedAppSpec.compilerInfo) {\n    delete strippedAppSpec.compilerInfo\n  }\n\n  // These are used for deploying but not for calling deployed apps\n  if (options.mode === 'minimal') {\n    if (strippedAppSpec.source) {\n      delete strippedAppSpec.source\n    }\n    if (strippedAppSpec.byteCode) {\n      delete strippedAppSpec.byteCode\n    }\n    if (strippedAppSpec.templateVariables) {\n      delete strippedAppSpec.templateVariables\n    }\n    if (strippedAppSpec.scratchVariables) {\n      delete strippedAppSpec.scratchVariables\n    }\n  }\n  return strippedAppSpec\n}\n\nexport function* generate(app: Arc56Contract, options?: Partial<GeneratorOptions>): DocumentParts {\n  const resolvedOptions: GeneratorOptions = {\n    // Set defaults\n    preserveNames: false,\n    mode: 'full',\n    ...options,\n  }\n  const reduceAppSpec = shrinkAppSpec(app, resolvedOptions)\n\n  const ctx = createGeneratorContext(reduceAppSpec, resolvedOptions)\n  yield `/* eslint-disable */`\n  yield `/**`\n  yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`\n  yield ` * DO NOT MODIFY IT BY HAND.`\n  yield ` * requires: @algorandfoundation/algokit-utils: ^7`\n  yield ` */`\n\n  yield* imports(ctx)\n  // Change the structs definition to sanitize property names according to the defined rules\n  // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp\n  reduceAppSpec.structs = Object.fromEntries(\n    Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]),\n  )\n  yield* inline('export const APP_SPEC: Arc56Contract = ', JSON.stringify(reduceAppSpec), ' as unknown as Arc56Contract')\n  yield NewLine\n\n  yield* utilityTypes()\n  yield NewLine\n  yield* appTypes(ctx)\n\n  if (ctx.mode === 'full') {\n    yield* deployTypes(ctx)\n  }\n  yield NewLine\n\n  // Write a call factory\n  yield* paramsFactory(ctx)\n  yield NewLine\n  // Write a factory in full mode\n  if (ctx.mode === 'full') {\n    yield* appFactory(ctx)\n  }\n  // Write a client\n  yield* appClient(ctx)\n\n  yield* callComposerType(ctx)\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.mjs","sources":["../../src/client/generate.ts"],"sourcesContent":["import { DocumentParts, inline, NewLine } from '../output/writer'\nimport { paramsFactory } from './params-factory'\nimport { appClient } from './app-client'\nimport { deployTypes } from './deploy-types'\nimport { utilityTypes } from './utility-types'\nimport { imports } from './imports'\nimport { createGeneratorContext, GeneratorOptions } from './generator-context'\nimport { appTypes } from './app-types'\nimport { callComposerType } from './call-composer-types'\nimport { Arc56Contract, ProgramSourceInfo, StructField } from '@algorandfoundation/algokit-utils/abi'\nimport { appFactory } from './app-factory'\nimport { Sanitizer } from '../util/sanitization'\n\nfunction convertStructs(s: StructField[], sanitizer: Sanitizer): StructField[] {\n  return s.map(\n    ({ name, type }) =>\n      ({\n        name: sanitizer.makeSafePropertyIdentifier(name),\n        type: typeof type === 'string' ? type : convertStructs(type, sanitizer),\n      }) satisfies StructField,\n  )\n}\n\nfunction shrinkAppSpec(app: Arc56Contract, options: GeneratorOptions): Arc56Contract {\n  const strippedAppSpec = structuredClone(app)\n\n  // Only keep the source info if it is needed for error mapping\n  const shrinkSourceInfo = (sourceInfo: ProgramSourceInfo['sourceInfo']) => {\n    return sourceInfo\n      .filter((entry) => entry.errorMessage)\n      .map((entry) => ({\n        pc: entry.pc,\n        errorMessage: entry.errorMessage,\n        // Keep minimal context for error mapping if available\n        ...(entry.teal !== undefined && { teal: entry.teal }),\n      }))\n  }\n\n  // Keep only source info entries that can be used for approval and clear program error mapping\n  if (strippedAppSpec.sourceInfo?.approval?.sourceInfo && strippedAppSpec.sourceInfo.approval.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.approval.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.approval.sourceInfo)\n  }\n\n  if (strippedAppSpec.sourceInfo?.clear?.sourceInfo && strippedAppSpec.sourceInfo.clear.sourceInfo.length > 0) {\n    strippedAppSpec.sourceInfo.clear.sourceInfo = shrinkSourceInfo(strippedAppSpec.sourceInfo.clear.sourceInfo)\n  }\n\n  if (strippedAppSpec.compilerInfo) {\n    delete strippedAppSpec.compilerInfo\n  }\n\n  // These are used for deploying but not for calling deployed apps\n  if (options.mode === 'minimal') {\n    if (strippedAppSpec.source) {\n      delete strippedAppSpec.source\n    }\n    if (strippedAppSpec.byteCode) {\n      delete strippedAppSpec.byteCode\n    }\n    if (strippedAppSpec.templateVariables) {\n      delete strippedAppSpec.templateVariables\n    }\n    if (strippedAppSpec.scratchVariables) {\n      delete strippedAppSpec.scratchVariables\n    }\n  }\n  return strippedAppSpec\n}\n\nexport function* generate(app: Arc56Contract, options?: Partial<GeneratorOptions>): DocumentParts {\n  const resolvedOptions: GeneratorOptions = {\n    // Set defaults\n    preserveNames: false,\n    mode: 'full',\n    ...options,\n  }\n  const reduceAppSpec = shrinkAppSpec(app, resolvedOptions)\n\n  const ctx = createGeneratorContext(reduceAppSpec, resolvedOptions)\n  yield `/* eslint-disable */`\n  yield `/**`\n  yield ` * This file was automatically generated by @algorandfoundation/algokit-client-generator.`\n  yield ` * DO NOT MODIFY IT BY HAND.`\n  yield ` * requires: @algorandfoundation/algokit-utils: ^10`\n  yield ` */`\n\n  yield* imports()\n  // Change the structs definition to sanitize property names according to the defined rules\n  // for instance, this may (unless you passed in --preserve-names) convert properties like my_prop to myProp\n  reduceAppSpec.structs = Object.fromEntries(\n    Object.keys(reduceAppSpec.structs).map((key) => [key, convertStructs(reduceAppSpec.structs[key], ctx.sanitizer)]),\n  )\n  yield* inline('export const APP_SPEC: Arc56Contract = ', JSON.stringify(reduceAppSpec), ' as unknown as Arc56Contract')\n  yield NewLine\n\n  yield* utilityTypes()\n  yield NewLine\n  yield* appTypes(ctx)\n\n  if (ctx.mode === 'full') {\n    yield* deployTypes(ctx)\n  }\n  yield NewLine\n\n  // Write a call factory\n  yield* paramsFactory(ctx)\n  yield NewLine\n  // Write a factory in full mode\n  if (ctx.mode === 'full') {\n    yield* appFactory(ctx)\n  }\n  // Write a client\n  yield* appClient(ctx)\n\n  yield* callComposerType(ctx)\n}\n"],"names":[],"mappings":"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"}

package/client/generator-context.d.ts

@@ -1,6 +1,6 @@
-import { CallConfigSummary } from './helpers/get-call-config-summary';
 import { Sanitizer } from '../util/sanitization';
-import { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56';
+import { Arc56Contract } from '@algorandfoundation/algokit-utils/abi';
+import { AppClientContext } from './app-client-context';
 declare const GenerateMode: {
     readonly FULL: "full";
     readonly MINIMAL: "minimal";
@@ -8,10 +8,8 @@ declare const GenerateMode: {
 export type GenerateMode = (typeof GenerateMode)[keyof typeof GenerateMode];
 export declare const generateModes: ("full" | "minimal")[];
 export type GeneratorContext = {
-    app: Arc56Contract;
     name: string;
-    callConfig: CallConfigSummary;
-    methodSignatureToUniqueName: Record<string, string>;
+    app: AppClientContext;
     sanitizer: Sanitizer;
     mode: GenerateMode;
 };

package/client/generator-context.js

@@ -1,8 +1,7 @@
 'use strict';
 
-var getCallConfigSummary = require('./helpers/get-call-config-summary.js');
 var sanitization = require('../util/sanitization.js');
-var algosdk = require('algosdk');
+var appClientContext = require('./app-client-context.js');
 
 const GenerateMode = {
     FULL: 'full',
@@ -11,16 +10,11 @@ const GenerateMode = {
 const generateModes = Object.values(GenerateMode);
 const createGeneratorContext = (app, options) => {
     const sanitizer = sanitization.getSanitizer(options);
+    const appCtx = appClientContext.createAppClientContext(app, sanitizer);
     return {
         sanitizer,
-        app,
-        name: sanitizer.makeSafeTypeIdentifier(app.name),
-        callConfig: getCallConfigSummary.getCallConfigSummary(app),
-        methodSignatureToUniqueName: app.methods.reduce((acc, cur) => {
-            const signature = new algosdk.ABIMethod(cur).getSignature();
-            acc[signature] = app.methods.some((m) => m.name === cur.name && m !== cur) ? signature : cur.name;
-            return acc;
-        }, {}),
+        name: appCtx.name.makeSafeTypeIdentifier,
+        app: appCtx,
         mode: options.mode,
     };
 };

package/client/generator-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator-context.js","sources":["../../src/client/generator-context.ts"],"sourcesContent":["import { CallConfigSummary, getCallConfigSummary } from './helpers/get-call-config-summary'\nimport { getSanitizer, Sanitizer } from '../util/sanitization'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { ABIMethod } from 'algosdk'\n\nconst GenerateMode = {\n  FULL: 'full',\n  MINIMAL: 'minimal',\n} as const\nexport type GenerateMode = (typeof GenerateMode)[keyof typeof GenerateMode]\nexport const generateModes = Object.values(GenerateMode)\n\nexport type GeneratorContext = {\n  app: Arc56Contract\n  name: string\n  callConfig: CallConfigSummary\n  methodSignatureToUniqueName: Record<string, string>\n  sanitizer: Sanitizer\n  mode: GenerateMode\n}\n\nexport type GeneratorOptions = {\n  preserveNames: boolean\n  mode: GenerateMode\n}\n\nexport const createGeneratorContext = (app: Arc56Contract, options: GeneratorOptions): GeneratorContext => {\n  const sanitizer = getSanitizer(options)\n  return {\n    sanitizer,\n    app,\n    name: sanitizer.makeSafeTypeIdentifier(app.name),\n    callConfig: getCallConfigSummary(app),\n    methodSignatureToUniqueName: app.methods.reduce(\n      (acc, cur) => {\n        const signature = new ABIMethod(cur).getSignature()\n        acc[signature] = app.methods.some((m) => m.name === cur.name && m !== cur) ? signature : cur.name\n        return acc\n      },\n      {} as Record<string, string>,\n    ),\n    mode: options.mode,\n  }\n}\n"],"names":["getSanitizer","getCallConfigSummary","ABIMethod"],"mappings":";;;;;;AAKA,MAAM,YAAY,GAAG;AACnB,IAAA,IAAI,EAAE,MAAM;AACZ,IAAA,OAAO,EAAE,SAAS;CACV;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY;MAgB1C,sBAAsB,GAAG,CAAC,GAAkB,EAAE,OAAyB,KAAsB;AACxG,IAAA,MAAM,SAAS,GAAGA,yBAAY,CAAC,OAAO,CAAC;IACvC,OAAO;QACL,SAAS;QACT,GAAG;QACH,IAAI,EAAE,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC;AAChD,QAAA,UAAU,EAAEC,yCAAoB,CAAC,GAAG,CAAC;AACrC,QAAA,2BAA2B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,GAAG,KAAI;YACX,MAAM,SAAS,GAAG,IAAIC,iBAAS,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE;AACnD,YAAA,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI;AACjG,YAAA,OAAO,GAAG;QACZ,CAAC,EACD,EAA4B,CAC7B;QACD,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB;AACH;;;;;"}
+{"version":3,"file":"generator-context.js","sources":["../../src/client/generator-context.ts"],"sourcesContent":["import { getSanitizer, Sanitizer } from '../util/sanitization'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/abi'\nimport { AppClientContext, createAppClientContext } from './app-client-context'\n\nconst GenerateMode = {\n  FULL: 'full',\n  MINIMAL: 'minimal',\n} as const\nexport type GenerateMode = (typeof GenerateMode)[keyof typeof GenerateMode]\nexport const generateModes = Object.values(GenerateMode)\n\nexport type GeneratorContext = {\n  name: string\n  app: AppClientContext\n  sanitizer: Sanitizer\n  mode: GenerateMode\n}\n\nexport type GeneratorOptions = {\n  preserveNames: boolean\n  mode: GenerateMode\n}\n\nexport const createGeneratorContext = (app: Arc56Contract, options: GeneratorOptions): GeneratorContext => {\n  const sanitizer = getSanitizer(options)\n  const appCtx = createAppClientContext(app, sanitizer)\n  return {\n    sanitizer,\n    name: appCtx.name.makeSafeTypeIdentifier,\n    app: appCtx,\n    mode: options.mode,\n  }\n}\n"],"names":["getSanitizer","createAppClientContext"],"mappings":";;;;;AAIA,MAAM,YAAY,GAAG;AACnB,IAAA,IAAI,EAAE,MAAM;AACZ,IAAA,OAAO,EAAE,SAAS;CACV;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY;MAc1C,sBAAsB,GAAG,CAAC,GAAkB,EAAE,OAAyB,KAAsB;AACxG,IAAA,MAAM,SAAS,GAAGA,yBAAY,CAAC,OAAO,CAAC;IACvC,MAAM,MAAM,GAAGC,uCAAsB,CAAC,GAAG,EAAE,SAAS,CAAC;IACrD,OAAO;QACL,SAAS;AACT,QAAA,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,sBAAsB;AACxC,QAAA,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB;AACH;;;;;"}

package/client/generator-context.mjs

@@ -1,6 +1,5 @@
-import { getCallConfigSummary } from './helpers/get-call-config-summary.mjs';
 import { getSanitizer } from '../util/sanitization.mjs';
-import { ABIMethod } from 'algosdk';
+import { createAppClientContext } from './app-client-context.mjs';
 
 const GenerateMode = {
     FULL: 'full',
@@ -9,16 +8,11 @@ const GenerateMode = {
 const generateModes = Object.values(GenerateMode);
 const createGeneratorContext = (app, options) => {
     const sanitizer = getSanitizer(options);
+    const appCtx = createAppClientContext(app, sanitizer);
     return {
         sanitizer,
-        app,
-        name: sanitizer.makeSafeTypeIdentifier(app.name),
-        callConfig: getCallConfigSummary(app),
-        methodSignatureToUniqueName: app.methods.reduce((acc, cur) => {
-            const signature = new ABIMethod(cur).getSignature();
-            acc[signature] = app.methods.some((m) => m.name === cur.name && m !== cur) ? signature : cur.name;
-            return acc;
-        }, {}),
+        name: appCtx.name.makeSafeTypeIdentifier,
+        app: appCtx,
         mode: options.mode,
     };
 };

package/client/generator-context.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator-context.mjs","sources":["../../src/client/generator-context.ts"],"sourcesContent":["import { CallConfigSummary, getCallConfigSummary } from './helpers/get-call-config-summary'\nimport { getSanitizer, Sanitizer } from '../util/sanitization'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56'\nimport { ABIMethod } from 'algosdk'\n\nconst GenerateMode = {\n  FULL: 'full',\n  MINIMAL: 'minimal',\n} as const\nexport type GenerateMode = (typeof GenerateMode)[keyof typeof GenerateMode]\nexport const generateModes = Object.values(GenerateMode)\n\nexport type GeneratorContext = {\n  app: Arc56Contract\n  name: string\n  callConfig: CallConfigSummary\n  methodSignatureToUniqueName: Record<string, string>\n  sanitizer: Sanitizer\n  mode: GenerateMode\n}\n\nexport type GeneratorOptions = {\n  preserveNames: boolean\n  mode: GenerateMode\n}\n\nexport const createGeneratorContext = (app: Arc56Contract, options: GeneratorOptions): GeneratorContext => {\n  const sanitizer = getSanitizer(options)\n  return {\n    sanitizer,\n    app,\n    name: sanitizer.makeSafeTypeIdentifier(app.name),\n    callConfig: getCallConfigSummary(app),\n    methodSignatureToUniqueName: app.methods.reduce(\n      (acc, cur) => {\n        const signature = new ABIMethod(cur).getSignature()\n        acc[signature] = app.methods.some((m) => m.name === cur.name && m !== cur) ? signature : cur.name\n        return acc\n      },\n      {} as Record<string, string>,\n    ),\n    mode: options.mode,\n  }\n}\n"],"names":[],"mappings":";;;;AAKA,MAAM,YAAY,GAAG;AACnB,IAAA,IAAI,EAAE,MAAM;AACZ,IAAA,OAAO,EAAE,SAAS;CACV;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY;MAgB1C,sBAAsB,GAAG,CAAC,GAAkB,EAAE,OAAyB,KAAsB;AACxG,IAAA,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;IACvC,OAAO;QACL,SAAS;QACT,GAAG;QACH,IAAI,EAAE,SAAS,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC;AAChD,QAAA,UAAU,EAAE,oBAAoB,CAAC,GAAG,CAAC;AACrC,QAAA,2BAA2B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,GAAG,KAAI;YACX,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE;AACnD,YAAA,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI;AACjG,YAAA,OAAO,GAAG;QACZ,CAAC,EACD,EAA4B,CAC7B;QACD,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB;AACH;;;;"}
+{"version":3,"file":"generator-context.mjs","sources":["../../src/client/generator-context.ts"],"sourcesContent":["import { getSanitizer, Sanitizer } from '../util/sanitization'\nimport { Arc56Contract } from '@algorandfoundation/algokit-utils/abi'\nimport { AppClientContext, createAppClientContext } from './app-client-context'\n\nconst GenerateMode = {\n  FULL: 'full',\n  MINIMAL: 'minimal',\n} as const\nexport type GenerateMode = (typeof GenerateMode)[keyof typeof GenerateMode]\nexport const generateModes = Object.values(GenerateMode)\n\nexport type GeneratorContext = {\n  name: string\n  app: AppClientContext\n  sanitizer: Sanitizer\n  mode: GenerateMode\n}\n\nexport type GeneratorOptions = {\n  preserveNames: boolean\n  mode: GenerateMode\n}\n\nexport const createGeneratorContext = (app: Arc56Contract, options: GeneratorOptions): GeneratorContext => {\n  const sanitizer = getSanitizer(options)\n  const appCtx = createAppClientContext(app, sanitizer)\n  return {\n    sanitizer,\n    name: appCtx.name.makeSafeTypeIdentifier,\n    app: appCtx,\n    mode: options.mode,\n  }\n}\n"],"names":[],"mappings":";;;AAIA,MAAM,YAAY,GAAG;AACnB,IAAA,IAAI,EAAE,MAAM;AACZ,IAAA,OAAO,EAAE,SAAS;CACV;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY;MAc1C,sBAAsB,GAAG,CAAC,GAAkB,EAAE,OAAyB,KAAsB;AACxG,IAAA,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;IACvC,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,EAAE,SAAS,CAAC;IACrD,OAAO;QACL,SAAS;AACT,QAAA,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,sBAAsB;AACxC,QAAA,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB;AACH;;;;"}

package/client/helpers/contains-non-void-method.d.ts

@@ -1,2 +1,2 @@
-import { Method } from '@algorandfoundation/algokit-utils/types/app-arc56';
-export declare const containsNonVoidMethod: (methods: Method[]) => boolean;
+import { AppClientMethodContext } from '../app-client-context';
+export declare const containsNonVoidMethod: (methods: AppClientMethodContext[]) => boolean;

package/client/helpers/contains-non-void-method.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var appClientContext = require('../app-client-context.js');
+
 const containsNonVoidMethod = (methods) => {
     return methods.some((method) => {
-        const returnType = method.returns.struct ?? method.returns.type ?? 'void';
-        return returnType !== 'void';
+        return appClientContext.isAbiMethod(method) && method.returns.tsOutType !== 'void';
     });
 };
 

package/client/helpers/contains-non-void-method.js.map

@@ -1 +1 @@
-{"version":3,"file":"contains-non-void-method.js","sources":["../../../src/client/helpers/contains-non-void-method.ts"],"sourcesContent":["import { Method } from '@algorandfoundation/algokit-utils/types/app-arc56'\n\nexport const containsNonVoidMethod = (methods: Method[]) => {\n  return methods.some((method) => {\n    const returnType = method.returns.struct ?? method.returns.type ?? 'void'\n    return returnType !== 'void'\n  })\n}\n"],"names":[],"mappings":";;AAEO,MAAM,qBAAqB,GAAG,CAAC,OAAiB,KAAI;AACzD,IAAA,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AAC7B,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM;QACzE,OAAO,UAAU,KAAK,MAAM;AAC9B,IAAA,CAAC,CAAC;AACJ;;;;"}
+{"version":3,"file":"contains-non-void-method.js","sources":["../../../src/client/helpers/contains-non-void-method.ts"],"sourcesContent":["import { AppClientMethodContext, isAbiMethod } from '../app-client-context'\n\nexport const containsNonVoidMethod = (methods: AppClientMethodContext[]) => {\n  return methods.some((method) => {\n    return isAbiMethod(method) && method.returns.tsOutType !== 'void'\n  })\n}\n"],"names":["isAbiMethod"],"mappings":";;;;AAEO,MAAM,qBAAqB,GAAG,CAAC,OAAiC,KAAI;AACzE,IAAA,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AAC7B,QAAA,OAAOA,4BAAW,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM;AACnE,IAAA,CAAC,CAAC;AACJ;;;;"}

package/client/helpers/contains-non-void-method.mjs

@@ -1,7 +1,8 @@
+import { isAbiMethod } from '../app-client-context.mjs';
+
 const containsNonVoidMethod = (methods) => {
     return methods.some((method) => {
-        const returnType = method.returns.struct ?? method.returns.type ?? 'void';
-        return returnType !== 'void';
+        return isAbiMethod(method) && method.returns.tsOutType !== 'void';
     });
 };
 

package/client/helpers/contains-non-void-method.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"contains-non-void-method.mjs","sources":["../../../src/client/helpers/contains-non-void-method.ts"],"sourcesContent":["import { Method } from '@algorandfoundation/algokit-utils/types/app-arc56'\n\nexport const containsNonVoidMethod = (methods: Method[]) => {\n  return methods.some((method) => {\n    const returnType = method.returns.struct ?? method.returns.type ?? 'void'\n    return returnType !== 'void'\n  })\n}\n"],"names":[],"mappings":"AAEO,MAAM,qBAAqB,GAAG,CAAC,OAAiB,KAAI;AACzD,IAAA,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AAC7B,QAAA,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM;QACzE,OAAO,UAAU,KAAK,MAAM;AAC9B,IAAA,CAAC,CAAC;AACJ;;;;"}
+{"version":3,"file":"contains-non-void-method.mjs","sources":["../../../src/client/helpers/contains-non-void-method.ts"],"sourcesContent":["import { AppClientMethodContext, isAbiMethod } from '../app-client-context'\n\nexport const containsNonVoidMethod = (methods: AppClientMethodContext[]) => {\n  return methods.some((method) => {\n    return isAbiMethod(method) && method.returns.tsOutType !== 'void'\n  })\n}\n"],"names":[],"mappings":";;AAEO,MAAM,qBAAqB,GAAG,CAAC,OAAiC,KAAI;AACzE,IAAA,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AAC7B,QAAA,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM;AACnE,IAAA,CAAC,CAAC;AACJ;;;;"}

package/client/helpers/get-equivalent-type.d.ts

@@ -1,6 +1,4 @@
-import { Arc56Contract } from '@algorandfoundation/algokit-utils/types/app-arc56';
+import { ABIReferenceType, ABIType, AVMType, ABITransactionType } from '@algorandfoundation/algokit-utils/abi';
 import { Sanitizer } from '../../util/sanitization';
-export declare function getEquivalentType(abiTypeStr: string, ioType: 'input' | 'output', ctx: {
-    app: Arc56Contract;
-    sanitizer: Sanitizer;
-}): string;
+export declare function getEquivalentType(algoType: ABIType | ABIReferenceType | ABITransactionType | AVMType | 'void', ioType: 'input' | 'output', sanitizer: Sanitizer): string;
+export declare function abiTypeToTs(abiType: ABIType, ioType: 'input' | 'output', sanitizer: Sanitizer): string;

package/client/helpers/get-equivalent-type.js

@@ -1,81 +1,80 @@
 'use strict';
 
-var algosdk = require('algosdk');
+var abi = require('@algorandfoundation/algokit-utils/abi');
 
 const bigIntOrNumberType = 'bigint | number';
 const bytesOrStringType = 'Uint8Array | string';
-function getEquivalentType(abiTypeStr, ioType, ctx) {
-    const { app, sanitizer } = ctx;
-    if (abiTypeStr == 'void') {
+function getEquivalentType(algoType, ioType, sanitizer) {
+    if (algoType == 'void') {
         return 'void';
     }
-    if (abiTypeStr == 'AVMBytes') {
+    if (algoType == 'AVMBytes') {
         return ioType === 'input' ? bytesOrStringType : 'Uint8Array';
     }
-    if (abiTypeStr == 'AVMString') {
+    if (algoType == 'AVMString') {
         return 'string';
     }
-    if (abiTypeStr == 'AVMUint64') {
+    if (algoType == 'AVMUint64') {
         return 'bigint';
     }
-    if (algosdk.abiTypeIsTransaction(abiTypeStr)) {
+    if (abi.argTypeIsTransaction(algoType)) {
         return 'AppMethodCallTransactionArgument';
     }
-    if (abiTypeStr == algosdk.ABIReferenceType.account) {
+    if (algoType == abi.ABIReferenceType.Account) {
         return bytesOrStringType;
     }
-    if (abiTypeStr == algosdk.ABIReferenceType.application || abiTypeStr == algosdk.ABIReferenceType.asset) {
+    if (algoType == abi.ABIReferenceType.Application || algoType == abi.ABIReferenceType.Asset) {
         return 'bigint';
     }
-    if (Object.keys(app.structs).includes(abiTypeStr)) {
-        return sanitizer.makeSafeTypeIdentifier(abiTypeStr);
+    return abiTypeToTs(algoType, ioType, sanitizer);
+}
+function abiTypeToTs(abiType, ioType, sanitizer) {
+    if (abiType instanceof abi.ABIStructType) {
+        return sanitizer.makeSafeTypeIdentifier(abiType.structName);
     }
-    const abiType = algosdk.ABIType.from(abiTypeStr);
-    return abiTypeToTs(abiType, ioType);
-    function abiTypeToTs(abiType, ioType) {
-        if (abiType instanceof algosdk.ABIUintType) {
-            if (abiType.bitSize < 53)
-                return ioType === 'input' ? bigIntOrNumberType : 'number';
-            return ioType === 'input' ? bigIntOrNumberType : 'bigint';
-        }
-        if (abiType instanceof algosdk.ABIArrayDynamicType) {
-            if (abiType.childType instanceof algosdk.ABIByteType)
-                return 'Uint8Array';
-            const childTsType = abiTypeToTs(abiType.childType, ioType);
-            if (childTsType === bigIntOrNumberType) {
-                return 'bigint[] | number[]';
-            }
-            else if (childTsType === bytesOrStringType) {
-                return 'Uint8Array[] | string[]';
-            }
-            return `${childTsType}[]`;
-        }
-        if (abiType instanceof algosdk.ABIArrayStaticType) {
-            if (abiType.childType instanceof algosdk.ABIByteType)
-                return 'Uint8Array';
-            return `[${new Array(abiType.staticLength).fill(abiTypeToTs(abiType.childType, ioType)).join(', ')}]`;
-        }
-        if (abiType instanceof algosdk.ABIAddressType) {
-            return 'string';
-        }
-        if (abiType instanceof algosdk.ABIBoolType) {
-            return 'boolean';
-        }
-        if (abiType instanceof algosdk.ABIUfixedType) {
-            return 'number';
-        }
-        if (abiType instanceof algosdk.ABITupleType) {
-            return `[${abiType.childTypes.map((c) => abiTypeToTs(c, ioType)).join(', ')}]`;
-        }
-        if (abiType instanceof algosdk.ABIByteType) {
-            return 'number';
+    if (abiType instanceof abi.ABIUintType) {
+        if (abiType.bitSize < 53)
+            return ioType === 'input' ? bigIntOrNumberType : 'number';
+        return ioType === 'input' ? bigIntOrNumberType : 'bigint';
+    }
+    if (abiType instanceof abi.ABIArrayDynamicType) {
+        if (abiType.childType instanceof abi.ABIByteType)
+            return 'Uint8Array';
+        const childTsType = abiTypeToTs(abiType.childType, ioType, sanitizer);
+        if (childTsType === bigIntOrNumberType) {
+            return 'bigint[] | number[]';
         }
-        if (abiType instanceof algosdk.ABIStringType) {
-            return 'string';
+        else if (childTsType === bytesOrStringType) {
+            return 'Uint8Array[] | string[]';
         }
-        return 'unknown';
+        return `${childTsType}[]`;
+    }
+    if (abiType instanceof abi.ABIArrayStaticType) {
+        if (abiType.childType instanceof abi.ABIByteType)
+            return 'Uint8Array';
+        return `[${new Array(abiType.length).fill(abiTypeToTs(abiType.childType, ioType, sanitizer)).join(', ')}]`;
+    }
+    if (abiType instanceof abi.ABIAddressType) {
+        return 'string';
+    }
+    if (abiType instanceof abi.ABIBoolType) {
+        return 'boolean';
+    }
+    if (abiType instanceof abi.ABIUfixedType) {
+        return 'number';
+    }
+    if (abiType instanceof abi.ABITupleType) {
+        return `[${abiType.childTypes.map((c) => abiTypeToTs(c, ioType, sanitizer)).join(', ')}]`;
+    }
+    if (abiType instanceof abi.ABIByteType) {
+        return 'number';
+    }
+    if (abiType instanceof abi.ABIStringType) {
+        return 'string';
     }
+    return 'unknown';
 }
 
+exports.abiTypeToTs = abiTypeToTs;
 exports.getEquivalentType = getEquivalentType;
 //# sourceMappingURL=get-equivalent-type.js.map