wasm-ast-types 0.21.0 → 0.23.0

package/src/message-composer/message-composer.ts

@@ -1,313 +1,262 @@
 import * as t from '@babel/types';
+import { Expression } from '@babel/types';
 import { camel } from 'case';
 import {
-    bindMethod,
-    typedIdentifier,
-    classDeclaration,
-    classProperty,
-    arrowFunctionExpression,
-    getMessageProperties
-} from '../utils'
-import { ExecuteMsg } from '../types';
+  arrowFunctionExpression,
+  bindMethod,
+  classDeclaration,
+  classProperty,
+  getMessageProperties,
+  OPTIONAL_FUNDS_PARAM,
+  typedIdentifier
+} from '../utils';
+import { ExecuteMsg, JSONSchema } from '../types';
 import { createTypedObjectParams } from '../utils/types';
-import { JSONSchema } from '../types';
 import { RenderContext } from '../context';
-import { identifier } from '../utils/babel';
 import { getWasmMethodArgs } from '../client/client';
-import { Expression } from '@babel/types';
 
 const createWasmExecMethodMessageComposer = (
-    context: RenderContext,
-    jsonschema: any
+  context: RenderContext,
+  jsonschema: any
 ) => {
+  context.addUtil('Coin');
+  context.addUtil('MsgExecuteContractEncodeObject');
+  context.addUtil('MsgExecuteContract');
+  context.addUtil('toUtf8');
 
-    context.addUtil('Coin');
-    context.addUtil('MsgExecuteContractEncodeObject');
-    context.addUtil('MsgExecuteContract');
-    context.addUtil('toUtf8');
-
-    const underscoreName = Object.keys(jsonschema.properties)[0];
-    const methodName = camel(underscoreName);
-    const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
-    const args = getWasmMethodArgs(
-        context,
-        jsonschema.properties[underscoreName]
-    );
+  const underscoreName = Object.keys(jsonschema.properties)[0];
+  const methodName = camel(underscoreName);
+  const param = createTypedObjectParams(
+    context,
+    jsonschema.properties[underscoreName]
+  );
+  const args = getWasmMethodArgs(
+    context,
+    jsonschema.properties[underscoreName]
+  );
 
   // what the underscore named property in the message is assigned to
-  let actionValue: Expression
+  let actionValue: Expression;
   if (param?.type === 'Identifier') {
     actionValue = t.identifier(param.name);
   } else {
-    actionValue = t.objectExpression(args)
+    actionValue = t.objectExpression(args);
   }
 
-    const constantParams = [
-        identifier('funds', t.tsTypeAnnotation(
-            t.tsArrayType(
-                t.tsTypeReference(
-                    t.identifier('Coin')
-                )
-            )
-        ), true)
-    ];
+  const constantParams = [OPTIONAL_FUNDS_PARAM];
 
-    return t.classProperty(
-        t.identifier(methodName),
-        arrowFunctionExpression(
-            param ? [
-                // props
-                param,
-                ...constantParams
-            ] : constantParams,
-            t.blockStatement(
+  return t.classProperty(
+    t.identifier(methodName),
+    arrowFunctionExpression(
+      param
+        ? [
+            // props
+            param,
+            ...constantParams
+          ]
+        : constantParams,
+      t.blockStatement([
+        t.returnStatement(
+          t.objectExpression([
+            t.objectProperty(
+              t.identifier('typeUrl'),
+              t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')
+            ),
+            t.objectProperty(
+              t.identifier('value'),
+              t.callExpression(
+                t.memberExpression(
+                  t.identifier('MsgExecuteContract'),
+                  t.identifier('fromPartial')
+                ),
                 [
-                    t.returnStatement(
-
-                        t.objectExpression([
-                            t.objectProperty(
-                                t.identifier('typeUrl'),
-                                t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')
-                            ),
-                            t.objectProperty(
-                                t.identifier('value'),
-                                t.callExpression(
-                                    t.memberExpression(
-                                        t.identifier('MsgExecuteContract'),
-                                        t.identifier('fromPartial')
-                                    ),
-                                    [
-                                        t.objectExpression([
-                                            t.objectProperty(
-                                                t.identifier('sender'),
-                                                t.memberExpression(
-                                                    t.thisExpression(),
-                                                    t.identifier('sender')
-                                                )
-                                            ),
-                                            t.objectProperty(
-                                                t.identifier('contract'),
-                                                t.memberExpression(
-                                                    t.thisExpression(),
-                                                    t.identifier('contractAddress')
-                                                )
-                                            ),
-                                            t.objectProperty(
-                                                t.identifier('msg'),
-                                                t.callExpression(
-                                                    t.identifier('toUtf8'),
-                                                    [
-                                                        t.callExpression(
-                                                            t.memberExpression(
-                                                                t.identifier('JSON'),
-                                                                t.identifier('stringify')
-                                                            ),
-                                                            [
-                                                                t.objectExpression(
-                                                                    [
-                                                                        t.objectProperty(
-                                                                            t.identifier(underscoreName), actionValue
-                                                                        )
-                                                                    ]
-
-                                                                )
-                                                            ]
-                                                        )
-                                                    ]
-                                                )
-                                            ),
-                                            t.objectProperty(
-                                                t.identifier('funds'),
-                                                t.identifier('funds'),
-                                                false,
-                                                true
-                                            ),
-                                        ])
-                                    ]
-                                )
-                            )
-                        ])
+                  t.objectExpression([
+                    t.objectProperty(
+                      t.identifier('sender'),
+                      t.memberExpression(
+                        t.thisExpression(),
+                        t.identifier('sender')
+                      )
+                    ),
+                    t.objectProperty(
+                      t.identifier('contract'),
+                      t.memberExpression(
+                        t.thisExpression(),
+                        t.identifier('contractAddress')
+                      )
+                    ),
+                    t.objectProperty(
+                      t.identifier('msg'),
+                      t.callExpression(t.identifier('toUtf8'), [
+                        t.callExpression(
+                          t.memberExpression(
+                            t.identifier('JSON'),
+                            t.identifier('stringify')
+                          ),
+                          [
+                            t.objectExpression([
+                              t.objectProperty(
+                                t.identifier(underscoreName),
+                                actionValue
+                              )
+                            ])
+                          ]
+                        )
+                      ])
+                    ),
+                    t.objectProperty(
+                      t.identifier('funds'),
+                      t.identifier('_funds')
                     )
+                  ])
                 ]
-            ),
-            // return type
-            t.tsTypeAnnotation(
-                t.tsTypeReference(
-                    t.identifier('MsgExecuteContractEncodeObject')
-                )
-            ),
-            false
+              )
+            )
+          ])
         )
-    );
-
-}
+      ]),
+      // return type
+      t.tsTypeAnnotation(
+        t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))
+      ),
+      false
+    )
+  );
+};
 
 export const createMessageComposerClass = (
-    context: RenderContext,
-    className: string,
-    implementsClassName: string,
-    execMsg: ExecuteMsg
+  context: RenderContext,
+  className: string,
+  implementsClassName: string,
+  execMsg: ExecuteMsg
 ) => {
+  const propertyNames = getMessageProperties(execMsg)
+    .map((method) => Object.keys(method.properties)?.[0])
+    .filter(Boolean);
 
-    const propertyNames = getMessageProperties(execMsg)
-        .map(method => Object.keys(method.properties)?.[0])
-        .filter(Boolean);
+  const bindings = propertyNames.map(camel).map(bindMethod);
 
-    const bindings = propertyNames
-        .map(camel)
-        .map(bindMethod);
+  const methods = getMessageProperties(execMsg).map((schema) => {
+    return createWasmExecMethodMessageComposer(context, schema);
+  });
 
-    const methods = getMessageProperties(execMsg)
-        .map(schema => {
-            return createWasmExecMethodMessageComposer(context, schema)
-        });
+  const blockStmt = [];
 
-    const blockStmt = [];
+  [].push.apply(blockStmt, [
+    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
+  ]);
 
-    [].push.apply(blockStmt, [
-        t.expressionStatement(
-            t.assignmentExpression(
-                '=',
-                t.memberExpression(
-                    t.thisExpression(),
-                    t.identifier('sender')
-                ),
-                t.identifier('sender')
-            )
+  return t.exportNamedDeclaration(
+    classDeclaration(
+      className,
+      [
+        // sender
+        classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
+
+        // contractAddress
+        classProperty(
+          'contractAddress',
+          t.tsTypeAnnotation(t.tsStringKeyword())
         ),
-        t.expressionStatement(
-            t.assignmentExpression(
-                '=',
-                t.memberExpression(
-                    t.thisExpression(),
-                    t.identifier('contractAddress')
-                ),
-                t.identifier('contractAddress')
+
+        // constructor
+        t.classMethod(
+          'constructor',
+          t.identifier('constructor'),
+          [
+            typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
+            typedIdentifier(
+              'contractAddress',
+              t.tsTypeAnnotation(t.tsStringKeyword())
             )
+          ],
+          t.blockStatement(blockStmt)
         ),
-        ...bindings
-    ]);
-
-    return t.exportNamedDeclaration(
-        classDeclaration(className,
-            [
-                // sender
-                classProperty('sender', t.tsTypeAnnotation(
-                    t.tsStringKeyword()
-                )),
-
-                // contractAddress
-                classProperty('contractAddress', t.tsTypeAnnotation(
-                    t.tsStringKeyword()
-                )),
-
-                // constructor
-                t.classMethod('constructor',
-                    t.identifier('constructor'),
-                    [
-                        typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
-                        typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))
-                    ],
-                    t.blockStatement(
-                        blockStmt
-                    )),
-                ...methods
-            ],
-            [
-                t.tSExpressionWithTypeArguments(
-                    t.identifier(implementsClassName)
-                )
-            ],
-            null
-        )
-    );
-}
+        ...methods
+      ],
+      [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))],
+      null
+    )
+  );
+};
 
 export const createMessageComposerInterface = (
-    context: RenderContext,
-    className: string,
-    execMsg: ExecuteMsg
+  context: RenderContext,
+  className: string,
+  execMsg: ExecuteMsg
 ) => {
+  const methods = getMessageProperties(execMsg).map((jsonschema) => {
+    const underscoreName = Object.keys(jsonschema.properties)[0];
+    const methodName = camel(underscoreName);
+    return createPropertyFunctionWithObjectParamsForMessageComposer(
+      context,
+      methodName,
+      'MsgExecuteContractEncodeObject',
+      jsonschema.properties[underscoreName]
+    );
+  });
 
-    const methods = getMessageProperties(execMsg)
-        .map(jsonschema => {
-            const underscoreName = Object.keys(jsonschema.properties)[0];
-            const methodName = camel(underscoreName);
-            return createPropertyFunctionWithObjectParamsForMessageComposer(
-                context,
-                methodName,
-                'MsgExecuteContractEncodeObject',
-                jsonschema.properties[underscoreName]
-            );
-        });
-
-    const extendsAst = [];
-
-    return t.exportNamedDeclaration(
-        t.tsInterfaceDeclaration(
-            t.identifier(className),
-            null,
-            extendsAst,
-            t.tSInterfaceBody(
-                [
+  const extendsAst = [];
 
-                    // contract address
-                    t.tSPropertySignature(
-                        t.identifier('contractAddress'),
-                        t.tsTypeAnnotation(
-                            t.tsStringKeyword()
-                        )
-                    ),
+  return t.exportNamedDeclaration(
+    t.tsInterfaceDeclaration(
+      t.identifier(className),
+      null,
+      extendsAst,
+      t.tSInterfaceBody([
+        // contract address
+        t.tSPropertySignature(
+          t.identifier('contractAddress'),
+          t.tsTypeAnnotation(t.tsStringKeyword())
+        ),
 
-                    // contract address
-                    t.tSPropertySignature(
-                        t.identifier('sender'),
-                        t.tsTypeAnnotation(
-                            t.tsStringKeyword()
-                        )
-                    ),
+        // contract address
+        t.tSPropertySignature(
+          t.identifier('sender'),
+          t.tsTypeAnnotation(t.tsStringKeyword())
+        ),
 
-                    ...methods,
-                ]
-            )
-        )
-    );
+        ...methods
+      ])
+    )
+  );
 };
 
 const createPropertyFunctionWithObjectParamsForMessageComposer = (
-    context: RenderContext,
-    methodName: string,
-    responseType: string,
-    jsonschema: JSONSchema
+  context: RenderContext,
+  methodName: string,
+  responseType: string,
+  jsonschema: JSONSchema
 ) => {
-    const obj = createTypedObjectParams(context, jsonschema);
-    const fixedParams = [
-        identifier('funds', t.tsTypeAnnotation(
-            t.tsArrayType(
-                t.tsTypeReference(
-                    t.identifier('Coin')
-                )
-            )
-        ), true)
-    ];
-    const func = {
-        type: 'TSFunctionType',
-        typeAnnotation: t.tsTypeAnnotation(t.tsTypeReference(
-            t.identifier(responseType)
-        )),
-        parameters: obj ? [
-            obj,
-            ...fixedParams
-
-        ] : fixedParams
-    }
+  const obj = createTypedObjectParams(context, jsonschema);
+  const fixedParams = [OPTIONAL_FUNDS_PARAM];
+  const func = {
+    type: 'TSFunctionType',
+    typeAnnotation: t.tsTypeAnnotation(
+      t.tsTypeReference(t.identifier(responseType))
+    ),
+    parameters: obj ? [obj, ...fixedParams] : fixedParams
+  };
 
-    return t.tSPropertySignature(
-        t.identifier(methodName),
-        t.tsTypeAnnotation(
-            // @ts-ignore:next-line
-            func
-        )
-    );
+  return t.tSPropertySignature(
+    t.identifier(methodName),
+    t.tsTypeAnnotation(
+      // @ts-ignore:next-line
+      func
+    )
+  );
 };
-

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

@@ -5,8 +5,10 @@ import { ExecuteMsg, QueryMsg } from '../types';
 import {
   callExpression,
   createTypedObjectParams,
+  FIXED_EXECUTE_PARAMS,
   getMessageProperties,
   identifier,
+  OPTIONAL_FUNDS_PARAM,
   tsObjectPattern,
   tsPropertySignature
 } from '../utils';
@@ -24,8 +26,8 @@ import {
 } from '../utils/types';
 import { ReactQueryOptions, RenderContext } from '../context';
 import { JSONSchema } from '../types';
-import { FIXED_EXECUTE_PARAMS } from '../client';
 import { ArrowFunctionExpression, objectExpression } from '@babel/types';
+import { OPTIONAL_FEE_PARAM, OPTIONAL_MEMO_PARAM } from '../utils/constants';
 
 interface ReactQueryHookQuery {
   context: RenderContext;
@@ -120,7 +122,7 @@ export const createReactQueryHooks = ({
         context,
         queryFactoryName,
         queryKeysName,
-        queryMsgs,
+        queryMsgs
       })
     );
   }
@@ -407,7 +409,7 @@ export const createReactQueryMutationArgsInterface = ({
     )
   ];
 
-  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation
+  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation;
 
   if (msgType) {
     body.push(
@@ -415,7 +417,8 @@ export const createReactQueryMutationArgsInterface = ({
         t.identifier('msg'),
         // @ts-ignore
         msgType
-      ));
+      )
+    );
   }
 
   context.addUtil('StdFee');
@@ -425,16 +428,11 @@ export const createReactQueryMutationArgsInterface = ({
     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
-          ) as t.TSTypeElement
-        )
-      )
+      t.tsTypeLiteral([
+        propertySignature('fee', OPTIONAL_FEE_PARAM.typeAnnotation, true),
+        propertySignature('memo', OPTIONAL_MEMO_PARAM.typeAnnotation, true),
+        propertySignature('funds', OPTIONAL_FUNDS_PARAM.typeAnnotation, true)
+      ])
     )
   );
 
@@ -568,9 +566,11 @@ export const createReactQueryMutationHook = ({
     t.objectProperty(
       t.identifier('args'),
       t.assignmentPattern(
-        t.objectPattern(
-          FIXED_EXECUTE_PARAMS.map((param) => shorthandProperty(param.name))
-        ),
+        t.objectPattern([
+          shorthandProperty('fee'),
+          shorthandProperty('memo'),
+          shorthandProperty('funds')
+        ]),
         t.objectExpression([])
       )
     )
@@ -606,11 +606,11 @@ export const createReactQueryMutationHook = ({
                     t.identifier('client'),
                     t.identifier(execMethodName)
                   ),
-                  (hasMsg ? [t.identifier('msg')] : []).concat(
-                    FIXED_EXECUTE_PARAMS.map((param) =>
-                      t.identifier(param.name)
-                    )
-                  )
+                  (hasMsg ? [t.identifier('msg')] : []).concat([
+                    t.identifier('fee'),
+                    t.identifier('memo'),
+                    t.identifier('funds')
+                  ])
                 ),
                 false // not async
               ),
@@ -787,7 +787,9 @@ function createReactQueryFactory({
                       t.tsTypeReference(
                         t.identifier(hookParamsTypeName),
                         t.tsTypeParameterInstantiation([
-                          t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+                          t.tsTypeReference(
+                            t.identifier(GENERIC_SELECT_RESPONSE_NAME)
+                          )
                         ])
                       )
                     )
@@ -840,7 +842,9 @@ function createReactQueryFactory({
                   t.tsTypeParameterInstantiation([
                     t.tsTypeReference(t.identifier(responseType)),
                     t.tsTypeReference(t.identifier('Error')),
-                    t.tsTypeReference(t.identifier(GENERIC_SELECT_RESPONSE_NAME))
+                    t.tsTypeReference(
+                      t.identifier(GENERIC_SELECT_RESPONSE_NAME)
+                    )
                   ])
                 )
               );
@@ -871,7 +875,6 @@ function createReactQueryHookGenericInterface({
   QueryClient,
   genericQueryInterfaceName
 }: ReactQueryHookGenericInterface) {
-
   const options = context.options.reactQuery;
   const genericResponseTypeName = 'TResponse';