wasm-ast-types 0.15.0 → 0.16.0

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.15.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": "ef4b39134cf220c860469ae3cae49aeab91ee80d"
+  "gitHead": "9724a2787e6427b62e874ece3b733b5bfa5be2af"
 }

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(