wasm-ast-types 0.4.1 → 0.5.0

package/module/utils/types.js

@@ -16,7 +16,7 @@ const getTypeStrFromRef = $ref => {
   }
 };
 
-const getTypeFromRef = $ref => {
+export const getTypeFromRef = $ref => {
   switch ($ref) {
     case '#/definitions/Binary':
       return t.tsTypeReference(t.identifier('Binary'));
@@ -34,8 +34,16 @@ const getArrayTypeFromRef = $ref => {
   return t.tsArrayType(getTypeFromRef($ref));
 };
 
-const getArrayTypeFromType = type => {
-  return t.tsArrayType(getType(type));
+const getArrayTypeFromItems = items => {
+  if (items.type === 'array') {
+    if (Array.isArray(items.items)) {
+      return t.tsArrayType(t.tsArrayType(getType(items.items[0].type)));
+    } else {
+      return t.tsArrayType(getArrayTypeFromItems(items.items));
+    }
+  }
+
+  return t.tsArrayType(getType(items.type));
 };
 
 export const getType = type => {
@@ -48,8 +56,6 @@ export const getType = type => {
 
     case 'integer':
       return t.tsNumberKeyword();
-    // case 'object':
-    // return t.tsObjectKeyword();
 
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
@@ -101,7 +107,7 @@ export const getPropertyType = (schema, prop) => {
       } else if (info.items.title) {
         type = t.tsArrayType(t.tsTypeReference(t.identifier(info.items.title)));
       } else if (info.items.type) {
-        type = getArrayTypeFromType(info.items.type);
+        type = getArrayTypeFromItems(info.items);
       } else {
         throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
       }
@@ -144,65 +150,72 @@ export const getPropertyType = (schema, prop) => {
     optional
   };
 };
-export const createTypedObjectParams = (jsonschema, camelize = true) => {
-  const keys = Object.keys(jsonschema.properties ?? {});
-  if (!keys.length) return;
-  const typedParams = keys.map(prop => {
-    if (jsonschema.properties[prop].type === 'object') {
-      if (jsonschema.properties[prop].title) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
-      } else {
-        throw new Error('createTypedObjectParams() contact maintainer');
-      }
+export function getPropertySignatureFromProp(jsonschema, prop, camelize) {
+  if (jsonschema.properties[prop].type === 'object') {
+    if (jsonschema.properties[prop].title) {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
+    } else {
+      throw new Error('createTypedObjectParams() contact maintainer');
     }
+  }
 
-    if (Array.isArray(jsonschema.properties[prop].allOf)) {
-      const isOptional = !jsonschema.required?.includes(prop);
-      const unionTypes = jsonschema.properties[prop].allOf.map(el => {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
-      const uniqUnionTypes = [...new Set(unionTypes)];
-
-      if (uniqUnionTypes.length === 1) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
-      }
-    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
-      const isOptional = !jsonschema.required?.includes(prop);
-      const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
-        if (el.title) return el.title;
-        if (el.$ref) return getTypeStrFromRef(el.$ref);
-        return el.type;
-      });
-      const uniqUnionTypes = [...new Set(unionTypes)];
-
-      if (uniqUnionTypes.length === 1) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
-      }
+  if (Array.isArray(jsonschema.properties[prop].allOf)) {
+    const isOptional = !jsonschema.required?.includes(prop);
+    const unionTypes = jsonschema.properties[prop].allOf.map(el => {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
+    const uniqUnionTypes = [...new Set(unionTypes)];
+
+    if (uniqUnionTypes.length === 1) {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+    } else {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
     }
-
-    try {
-      getPropertyType(jsonschema, prop);
-    } catch (e) {
-      console.log(e);
-      console.log(jsonschema, prop);
+  } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
+    const isOptional = !jsonschema.required?.includes(prop);
+    const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
+      if (el.title) return el.title;
+      if (el.$ref) return getTypeStrFromRef(el.$ref);
+      return el.type;
+    });
+    const uniqUnionTypes = [...new Set(unionTypes)];
+
+    if (uniqUnionTypes.length === 1) {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+    } else {
+      return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
     }
+  }
+
+  try {
+    getPropertyType(jsonschema, prop);
+  } catch (e) {
+    console.log(e);
+    console.log(jsonschema, prop);
+  }
+
+  const {
+    type,
+    optional
+  } = getPropertyType(jsonschema, prop);
+  return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
+}
+export const getParamsTypeAnnotation = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return undefined;
+  const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
+  return t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+};
+export const createTypedObjectParams = (jsonschema, camelize = true) => {
+  const keys = Object.keys(jsonschema.properties ?? {});
+  if (!keys.length) return; // const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
 
-    const {
-      type,
-      optional
-    } = getPropertyType(jsonschema, prop);
-    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
-  });
   const params = keys.map(prop => {
     return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
   });
   const obj = t.objectPattern([...params]);
-  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
+  obj.typeAnnotation = getParamsTypeAnnotation(jsonschema, camelize);
   return obj;
 };

package/module/wasm.arrays.spec.js

@@ -0,0 +1,24 @@
+import generate from '@babel/generator';
+import message from './../../../__fixtures__/arrays/schema/schema.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(message));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, message));
+});

package/module/wasm.js

@@ -27,6 +27,7 @@ export const createQueryClass = (className, implementsClassName, queryMsg) => {
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// 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('contractAddress')), t.identifier('contractAddress'))), ...bindings])), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]));
 };
+export const CONSTANT_EXEC_PARAMS = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
 export const createWasmExecMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -35,9 +36,8 @@ export const createWasmExecMethod = jsonschema => {
   const args = Object.keys(properties).map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
-  const constantParams = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
-  obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  obj, ...CONSTANT_EXEC_PARAMS] : CONSTANT_EXEC_PARAMS, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
@@ -81,13 +81,13 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
+export const FIXED_EXECUTE_PARAMS = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
 export const createPropertyFunctionWithObjectParamsForExec = (methodName, responseType, jsonschema) => {
   const obj = createTypedObjectParams(jsonschema);
-  const fixedParams = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
-    parameters: obj ? [obj, ...fixedParams] : fixedParams
+    parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.4.1",
+  "version": "0.5.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",
@@ -84,5 +84,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "b0312f7e16b8fd1c4892da6d91d3f7cf6c1bd49e"
+  "gitHead": "871479982969e89f40b75ca5c85e8bed34a824da"
 }

package/types/react-query.d.ts

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { QueryMsg } from './types';
+import { QueryMsg, ExecuteMsg } from './types';
 
 interface ReactQueryHooks {
     queryMsg: QueryMsg
@@ -18,6 +18,8 @@ interface ReactQueryHookQuery {
 
 export declare interface ReactQueryOptions {
     optionalClient?: boolean
+    v4?: boolean
+    mutations?: boolean
 }
 export declare const createReactQueryHooks: ({ queryMsg, contractName, QueryClient, options }: ReactQueryHooks) => any;
 export declare const createReactQueryHook: ({ hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
@@ -28,4 +30,41 @@ interface ReactQueryHookQueryInterface {
     jsonschema: any;
 }
 export declare const createReactQueryHookInterface: ({ QueryClient, hookParamsTypeName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
+
+interface ReactQueryMutationHooks {
+    execMsg: ExecuteMsg
+    contractName: string
+    ExecuteClient: string
+    options?: ReactQueryOptions
+}
+export declare const createReactQueryMutationHooks: ({ execMsg, contractName, ExecuteClient, options }: ReactQueryMutationHooks) => any
+
+interface ReactQueryMutationHook {
+    mutationHookName: string;
+    mutationHookParamsTypeName: string;
+    execMethodName: string;
+    execArgs: t.ObjectProperty[]
+    options?: ReactQueryOptions
+}
+
+export declare const createReactQueryMutationHook: ({
+    mutationHookName,
+    mutationHookParamsTypeName,
+    execMethodName,
+    execArgs,
+    options,
+}: ReactQueryMutationHook) => any
+
+interface ReactQueryMutationHookInterface {
+    ExecuteClient: string
+    mutationHookParamsTypeName: string;
+    jsonschema: any
+}
+
+export declare const createReactQueryMutationArgsInterface: ({
+    ExecuteClient,
+    mutationHookParamsTypeName,
+    jsonschema
+}: ReactQueryMutationHookInterface) => t.ExportNamedDeclaration;
+
 export { };