wasm-ast-types 0.14.0 → 0.16.0

package/main/client/client.js

@@ -120,10 +120,11 @@ var createExecuteClass = function createExecuteClass(context, className, impleme
 
   [].push.apply(blockStmt, [// client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('sender')), t.identifier('sender'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress')))].concat((0, _toConsumableArray2["default"])(bindings)));
+  var noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
   return t.exportNamedDeclaration((0, _utils.classDeclaration)(className, [// client
-  (0, _utils.classProperty)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // sender
+  (0, _utils.classProperty)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient'))), false, false, noImplicitOverride), // sender
   (0, _utils.classProperty)('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
-  (0, _utils.classProperty)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
+  (0, _utils.classProperty)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()), false, false, noImplicitOverride), // constructor
   t.classMethod('constructor', t.identifier('constructor'), [(0, _utils.typedIdentifier)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), (0, _utils.typedIdentifier)('sender', t.tsTypeAnnotation(t.tsStringKeyword())), (0, _utils.typedIdentifier)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt))].concat((0, _toConsumableArray2["default"])(methods)), [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], extendsClassName ? t.identifier(extendsClassName) : null));
 };
 

package/main/client/test/ts-client.overrides.spec.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _execute_msg_for__empty = _interopRequireDefault(require("../../../../../__fixtures__/sg721/execute_msg_for__empty.json"));
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
+describe('exec', function () {});
+it('Impl, execExtends, noExtendsClass', function () {
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
+});
+it('Impl, execExtends, ExtendsClass', function () {
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', _execute_msg_for__empty["default"]));
+});
+it('noImpl, execExtends, ExtendsClass', function () {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = true;
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', _execute_msg_for__empty["default"]));
+});
+it('noImpl, noExecExtends, ExtendsClass', function () {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', _execute_msg_for__empty["default"]));
+});
+it('noImpl, noExecExtends, noExtendsClass', function () {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));
+});

package/main/context/context.js

@@ -29,7 +29,8 @@ var defaultOptions = {
   },
   client: {
     enabled: true,
-    execExtendsQuery: true
+    execExtendsQuery: true,
+    noImplicitOverride: false
   },
   recoil: {
     enabled: false

package/main/react-query/react-query.js

@@ -184,16 +184,17 @@ exports.createReactQueryHook = createReactQueryHook;
 /**
  * Example:
 ```
-export interface Cw4UpdateMembersMutation {
-  client: Cw4GroupClient
-  args: {
-    tokenId: string
-    remove: string[]
-  }
-  options?: Omit<
-    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
-    'mutationFn'
-  >
+ export interface Cw721RevokeMutation {
+  client: Cw721Client;
+  msg: {
+    spender: string;
+    tokenId: string;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
 }
 ```
  */
@@ -205,15 +206,12 @@ var createReactQueryMutationArgsInterface = function createReactQueryMutationArg
       jsonschema = _ref4.jsonschema;
   var typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
-  var msgType = (0, _types2.getParamsTypeAnnotation)(context, jsonschema);
+  var msgType = (0, _utils.createTypedObjectParams)(context, jsonschema).typeAnnotation;
 
   if (msgType) {
     body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
   }
 
-  context.addUtil('StdFee');
-  context.addUtil('Coin'); //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
-
   var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
   t.tsTypeLiteral(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
     return (0, _babel.propertySignature)(param.name, // @ts-ignore:next-line

package/main/utils/babel.js

@@ -125,10 +125,12 @@ var classProperty = function classProperty(name) {
   var typeAnnotation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var isReadonly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isStatic = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var noImplicitOverride = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var prop = t.classProperty(t.identifier(name));
   if (isReadonly) prop.readonly = true;
   if (isStatic) prop["static"] = true;
   if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
+  if (noImplicitOverride) prop.override = true;
   return prop;
 };
 

package/module/client/client.js

@@ -71,10 +71,11 @@ export const createExecuteClass = (context, className, implementsClassName, exte
 
   [].push.apply(blockStmt, [// client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('sender')), t.identifier('sender'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings]);
+  const noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
   return t.exportNamedDeclaration(classDeclaration(className, [// client
-  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // sender
+  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient'))), false, false, noImplicitOverride), // sender
   classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()), false, false, noImplicitOverride), // constructor
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], extendsClassName ? t.identifier(extendsClassName) : null));
 };
 export const createExecuteInterface = (context, className, extendsClassName, execMsg) => {

package/module/client/test/ts-client.overrides.spec.js

@@ -0,0 +1,30 @@
+import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import { createExecuteClass } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+const ctx = makeContext(execute_msg_for__empty);
+describe('exec', () => {});
+it('Impl, execExtends, noExtendsClass', () => {
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('Impl, execExtends, ExtendsClass', () => {
+  ctx.options.client.noImplicitOverride = false;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', execute_msg_for__empty));
+});
+it('noImpl, execExtends, ExtendsClass', () => {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = true;
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', execute_msg_for__empty));
+});
+it('noImpl, noExecExtends, ExtendsClass', () => {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', 'ExtendsClassName', execute_msg_for__empty));
+});
+it('noImpl, noExecExtends, noExtendsClass', () => {
+  ctx.options.client.noImplicitOverride = true;
+  ctx.options.client.execExtendsQuery = false;
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});

package/module/context/context.js

@@ -15,7 +15,8 @@ export const defaultOptions = {
   },
   client: {
     enabled: true,
-    execExtendsQuery: true
+    execExtendsQuery: true,
+    noImplicitOverride: false
   },
   recoil: {
     enabled: false

package/module/react-query/react-query.js

@@ -1,8 +1,8 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { callExpression, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
+import { callExpression, createTypedObjectParams, getMessageProperties, identifier, tsObjectPattern, tsPropertySignature } from '../utils';
 import { omitTypeReference, optionalConditionalExpression, propertySignature, shorthandProperty } from '../utils/babel';
-import { getParamsTypeAnnotation, getPropertyType, getResponseType } from '../utils/types';
+import { getPropertyType, getResponseType } from '../utils/types';
 import { FIXED_EXECUTE_PARAMS } from '../client';
 export const createReactQueryHooks = ({
   context,
@@ -154,16 +154,17 @@ export const createReactQueryHook = ({
 /**
  * Example:
 ```
-export interface Cw4UpdateMembersMutation {
-  client: Cw4GroupClient
-  args: {
-    tokenId: string
-    remove: string[]
-  }
-  options?: Omit<
-    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
-    'mutationFn'
-  >
+ export interface Cw721RevokeMutation {
+  client: Cw721Client;
+  msg: {
+    spender: string;
+    tokenId: string;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
 }
 ```
  */
@@ -176,15 +177,12 @@ export const createReactQueryMutationArgsInterface = ({
 }) => {
   const typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
-  const msgType = getParamsTypeAnnotation(context, jsonschema);
+  const msgType = createTypedObjectParams(context, jsonschema).typeAnnotation;
 
   if (msgType) {
     body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
   }
 
-  context.addUtil('StdFee');
-  context.addUtil('Coin'); //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
-
   const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
   t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, // @ts-ignore:next-line
   param.typeAnnotation, param.optional)))));

package/module/utils/babel.js

@@ -62,11 +62,12 @@ export const classDeclaration = (name, body, implementsExressions = [], superCla
 
   return declaration;
 };
-export const classProperty = (name, typeAnnotation = null, isReadonly = false, isStatic = false) => {
+export const classProperty = (name, typeAnnotation = null, isReadonly = false, isStatic = false, noImplicitOverride = false) => {
   const prop = t.classProperty(t.identifier(name));
   if (isReadonly) prop.readonly = true;
   if (isStatic) prop.static = true;
   if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
+  if (noImplicitOverride) prop.override = true;
   return prop;
 };
 export const arrowFunctionExpression = (params, body, returnType, isAsync = false) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "e58a660b6265fc94bdd11f311afe9fac11708c51"
+  "gitHead": "9724a2787e6427b62e874ece3b733b5bfa5be2af"
 }

package/src/client/client.ts

@@ -414,13 +414,15 @@ export const createExecuteClass = (
     ...bindings
   ]);
 
+  const noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
+
   return t.exportNamedDeclaration(
     classDeclaration(className,
       [
         // client
         classProperty('client', t.tsTypeAnnotation(
           t.tsTypeReference(t.identifier('SigningCosmWasmClient'))
-        )),
+        ), false, false, noImplicitOverride),
 
         // sender
         classProperty('sender', t.tsTypeAnnotation(
@@ -430,7 +432,7 @@ export const createExecuteClass = (
         // contractAddress
         classProperty('contractAddress', t.tsTypeAnnotation(
           t.tsStringKeyword()
-        )),
+        ), false, false, noImplicitOverride),
 
         // constructor
         t.classMethod('constructor',

package/src/client/test/__snapshots__/ts-client.overrides.spec.ts.snap

@@ -0,0 +1,709 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Impl, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`Impl, execExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, execExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  override client: SigningCosmWasmClient;
+  sender: string;
+  override contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, noExecExtends, ExtendsClass 1`] = `
+"export class SG721Client extends ExtendsClassName implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`noImpl, noExecExtends, noExtendsClass 1`] = `
+"export class SG721Client implements SG721Instance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.transferNft = this.transferNft.bind(this);
+    this.sendNft = this.sendNft.bind(this);
+    this.approve = this.approve.bind(this);
+    this.revoke = this.revoke.bind(this);
+    this.approveAll = this.approveAll.bind(this);
+    this.revokeAll = this.revokeAll.bind(this);
+    this.mint = this.mint.bind(this);
+    this.burn = this.burn.bind(this);
+  }
+
+  transferNft = async ({
+    recipient,
+    tokenId
+  }: {
+    recipient: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      transfer_nft: {
+        recipient,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  sendNft = async ({
+    contract,
+    msg,
+    tokenId
+  }: {
+    contract: string;
+    msg: Binary;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_nft: {
+        contract,
+        msg,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approve = async ({
+    expires,
+    spender,
+    tokenId
+  }: {
+    expires?: Expiration;
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve: {
+        expires,
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  revoke = async ({
+    spender,
+    tokenId
+  }: {
+    spender: string;
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke: {
+        spender,
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+  approveAll = async ({
+    expires,
+    operator
+  }: {
+    expires?: Expiration;
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      approve_all: {
+        expires,
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  revokeAll = async ({
+    operator
+  }: {
+    operator: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      revoke_all: {
+        operator
+      }
+    }, fee, memo, funds);
+  };
+  mint = async ({
+    extension,
+    owner,
+    tokenId,
+    tokenUri
+  }: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      mint: {
+        extension,
+        owner,
+        token_id: tokenId,
+        token_uri: tokenUri
+      }
+    }, fee, memo, funds);
+  };
+  burn = async ({
+    tokenId
+  }: {
+    tokenId: string;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      burn: {
+        token_id: tokenId
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;

package/src/client/test/ts-client.overrides.spec.ts

@@ -0,0 +1,74 @@
+import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, makeContext } from '../../../test-utils';
+
+const ctx = makeContext(execute_msg_for__empty);
+
+describe('exec', () => {
+
+})
+
+it('Impl, execExtends, noExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = false;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        execute_msg_for__empty
+    ))
+});
+
+it('Impl, execExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = false;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, execExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = true;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, noExecExtends, ExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = false;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        'ExtendsClassName',
+        execute_msg_for__empty
+    ))
+});
+
+it('noImpl, noExecExtends, noExtendsClass', () => {
+    ctx.options.client.noImplicitOverride = true;
+    ctx.options.client.execExtendsQuery = false;
+    expectCode(createExecuteClass(
+        ctx,
+        'SG721Client',
+        'SG721Instance',
+        null,
+        execute_msg_for__empty
+    ))
+});

package/src/context/context.ts

@@ -16,6 +16,7 @@ export interface ReactQueryOptions {
 export interface TSClientOptions {
     enabled?: boolean;
     execExtendsQuery?: boolean;
+    noImplicitOverride?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;
@@ -70,7 +71,8 @@ export const defaultOptions: RenderOptions = {
     },
     client: {
         enabled: true,
-        execExtendsQuery: true
+        execExtendsQuery: true,
+        noImplicitOverride: false,
     },
     recoil: {
         enabled: false

package/src/react-query/__snapshots__/react-query.spec.ts.snap

@@ -1149,7 +1149,12 @@ export function useSg721BurnMutation(options?: Omit<UseMutationOptions<ExecuteRe
 }
 export interface Sg721MintMutation {
   client: Sg721Client;
-  msg: MintMsg_for_Empty;
+  msg: {
+    extension: Empty;
+    owner: string;
+    tokenId: string;
+    tokenUri?: string;
+  };
   args?: {
     fee?: number | StdFee | \\"auto\\";
     memo?: string;

package/src/react-query/react-query.ts

@@ -4,11 +4,13 @@ import { camel, pascal } from 'case';
 import { ExecuteMsg, QueryMsg } from '../types';
 import {
   callExpression,
+  createTypedObjectParams,
   getMessageProperties,
   identifier,
   tsObjectPattern,
   tsPropertySignature
 } from '../utils';
+
 import {
   omitTypeReference,
   optionalConditionalExpression,
@@ -371,16 +373,17 @@ interface ReactQueryMutationHookInterface {
 /**
  * Example:
 ```
-export interface Cw4UpdateMembersMutation {
-  client: Cw4GroupClient
-  args: {
-    tokenId: string
-    remove: string[]
-  }
-  options?: Omit<
-    UseMutationOptions<ExecuteResult, Error, Pick<Cw4UpdateMembersMutation, 'args'>>,
-    'mutationFn'
-  >
+ export interface Cw721RevokeMutation {
+  client: Cw721Client;
+  msg: {
+    spender: string;
+    tokenId: string;
+  };
+  args?: {
+    fee?: number | StdFee | "auto";
+    memo?: string;
+    funds?: Coin[];
+  };
 }
 ```
  */
@@ -404,19 +407,16 @@ export const createReactQueryMutationArgsInterface = ({
     )
   ];
 
-  const msgType: t.TSTypeAnnotation = getParamsTypeAnnotation(
-    context,
-    jsonschema
-  );
+  const msgType = createTypedObjectParams(context, jsonschema).typeAnnotation as unknown as t.TSTypeAnnotation
 
   if (msgType) {
-    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+    body.push(
+      t.tsPropertySignature(
+        t.identifier('msg'),
+        msgType
+      ));
   }
 
-  context.addUtil('StdFee');
-  context.addUtil('Coin');
-  //  fee: number | StdFee | "auto" = "auto", memo?: string, funds?: Coin[]
-
   const optionalArgs = t.tsPropertySignature(
     t.identifier('args'),
     t.tsTypeAnnotation(

package/src/utils/babel.ts

@@ -125,11 +125,18 @@ export const classDeclaration = (name: string, body: any[], implementsExressions
 };
 
 
-export const classProperty = (name: string, typeAnnotation: TSTypeAnnotation = null, isReadonly: boolean = false, isStatic: boolean = false) => {
+export const classProperty = (
+    name: string,
+    typeAnnotation: TSTypeAnnotation = null,
+    isReadonly: boolean = false,
+    isStatic: boolean = false,
+    noImplicitOverride: boolean = false
+) => {
     const prop = t.classProperty(t.identifier(name));
     if (isReadonly) prop.readonly = true;
     if (isStatic) prop.static = true;
     if (typeAnnotation) prop.typeAnnotation = typeAnnotation;
+    if (noImplicitOverride) prop.override = true;
     return prop;
 };
 

package/types/context/context.d.ts

@@ -11,6 +11,7 @@ export interface ReactQueryOptions {
 export interface TSClientOptions {
     enabled?: boolean;
     execExtendsQuery?: boolean;
+    noImplicitOverride?: boolean;
 }
 export interface MessageComposerOptions {
     enabled?: boolean;

package/types/react-query/react-query.d.ts

@@ -43,7 +43,7 @@ export interface Cw4UpdateMembersMutation {
 }
 ```
  */
-export declare const createReactQueryMutationArgsInterface: ({ context, ExecuteClient, mutationHookParamsTypeName, useMutationTypeParameter, jsonschema, }: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
+export declare const createReactQueryMutationArgsInterface: ({ context, ExecuteClient, mutationHookParamsTypeName, useMutationTypeParameter, jsonschema }: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
 interface ReactQueryMutationHooks {
     context: RenderContext;
     execMsg: ExecuteMsg;
@@ -70,7 +70,7 @@ export const useCw4UpdateMembersMutation = ({ client, options }: Omit<Cw4UpdateM
   )
 ```
  */
-export declare const createReactQueryMutationHook: ({ context, mutationHookName, mutationHookParamsTypeName, execMethodName, useMutationTypeParameter, hasMsg, }: ReactQueryMutationHook) => t.ExportNamedDeclaration;
+export declare const createReactQueryMutationHook: ({ context, mutationHookName, mutationHookParamsTypeName, execMethodName, useMutationTypeParameter, hasMsg }: ReactQueryMutationHook) => t.ExportNamedDeclaration;
 interface ReactQueryHookQueryInterface {
     context: RenderContext;
     QueryClient: string;

package/types/utils/babel.d.ts

@@ -17,7 +17,7 @@ export declare const bindMethod: (name: string) => t.ExpressionStatement;
 export declare const typedIdentifier: (name: string, typeAnnotation: TSTypeAnnotation, optional?: boolean) => t.Identifier;
 export declare const promiseTypeAnnotation: (name: any) => t.TSTypeAnnotation;
 export declare const classDeclaration: (name: string, body: any[], implementsExressions?: TSExpressionWithTypeArguments[], superClass?: t.Identifier) => t.ClassDeclaration;
-export declare const classProperty: (name: string, typeAnnotation?: TSTypeAnnotation, isReadonly?: boolean, isStatic?: boolean) => t.ClassProperty;
+export declare const classProperty: (name: string, typeAnnotation?: TSTypeAnnotation, isReadonly?: boolean, isStatic?: boolean, noImplicitOverride?: boolean) => t.ClassProperty;
 export declare const arrowFunctionExpression: (params: (t.Identifier | t.Pattern | t.RestElement)[], body: t.BlockStatement, returnType: t.TSTypeAnnotation, isAsync?: boolean) => t.ArrowFunctionExpression;
 export declare const recursiveNamespace: (names: any, moduleBlockBody: any) => any;
 export declare const arrayTypeNDimensions: (body: any, n: any) => any;