wasm-ast-types 0.24.0 → 0.26.0

package/module/context/context.js

@@ -1,13 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { refLookup } from "../utils";
 import { convertUtilsToImportList, getImportStatements } from "./imports";
 import deepmerge from "deepmerge";
-import { basename, extname } from 'path'; /// Plugin Types
+import { basename, extname } from 'path';
+
+/// Plugin Types
+
+/// END Plugin Types
 
 ;
 export const defaultOptions = {
@@ -27,7 +28,7 @@ export const defaultOptions = {
   messageComposer: {
     enabled: false
   },
-  msgBuilder: {
+  messageBuilder: {
     enabled: false
   },
   reactQuery: {
@@ -41,7 +42,8 @@ export const defaultOptions = {
 };
 export const getDefinitionSchema = schemas => {
   const aggregateSchema = {
-    definitions: {//
+    definitions: {
+      //
     }
   };
   schemas.forEach(schema => {
@@ -54,42 +56,33 @@ export class BuilderContext {
   constructor() {
     _defineProperty(this, "providers", {});
   }
-
   addProviderInfo(contractName, type, classname, filename) {
     if (!this.providers[contractName]) {
       this.providers[contractName] = {};
     }
-
     this.providers[contractName][type] = {
       classname,
       filename,
       basename: basename(filename, extname(filename))
     };
   }
-
   getProviderInfos() {
     return this.providers;
   }
-
 }
+
 /**
  * context object for generating code.
  * only mergeDefaultOpt needs to implementing for combine options and default options.
  * @param TOpt option type
  */
-
 export class RenderContextBase {
   constructor(contract, options, builderContext) {
     _defineProperty(this, "builderContext", void 0);
-
     _defineProperty(this, "contract", void 0);
-
     _defineProperty(this, "utils", []);
-
     _defineProperty(this, "schema", void 0);
-
     _defineProperty(this, "options", void 0);
-
     this.contract = contract;
     this.schema = getDefinitionSchema(contract.schemas);
     this.options = this.mergeDefaultOpt(options);
@@ -100,31 +93,24 @@ export class RenderContextBase {
    * @param options
    */
 
-
   refLookup($ref) {
     return refLookup($ref, this.schema);
   }
-
   addUtil(util) {
     this.utils[util] = true;
   }
-
   addProviderInfo(contractName, type, classname, filename) {
     this.builderContext.addProviderInfo(contractName, type, classname, filename);
   }
-
   getProviderInfos() {
     return this.builderContext.providers;
   }
-
   getImports(registeredUtils, filepath) {
     return getImportStatements(convertUtilsToImportList(this, Object.keys(this.utils), registeredUtils), filepath);
   }
-
 }
 export class RenderContext extends RenderContextBase {
   mergeDefaultOpt(options) {
     return deepmerge(defaultOptions, options ?? {});
   }
-
 }

package/module/context/imports.js

@@ -1,13 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import * as t from '@babel/types';
 import { importAs, importStmt } from "../utils";
 import { relative, dirname, extname } from 'path';
-
 const makeReactQuerySwitch = varName => {
   return context => {
     switch (context.options.reactQuery.version) {
@@ -17,7 +13,6 @@ const makeReactQuerySwitch = varName => {
           path: '@tanstack/react-query',
           name: varName
         };
-
       case 'v3':
       default:
         return {
@@ -28,7 +23,6 @@ const makeReactQuerySwitch = varName => {
     }
   };
 };
-
 export const UTILS = {
   selectorFamily: 'recoil',
   MsgExecuteContract: 'cosmjs-types/cosmwasm/wasm/v1/tx',
@@ -49,27 +43,21 @@ export const UTIL_HELPERS = ['__contractContextBase__'];
 export const convertUtilsToImportList = (context, utils, registeredUtils) => {
   return utils.map(util => {
     let result = null;
-
     if (registeredUtils) {
       result = convertUtil(context, util, registeredUtils);
-
       if (result) {
         return result;
       }
     }
-
     result = convertUtil(context, util, UTILS);
-
     if (result) {
       return result;
     }
-
     throw new Error(`missing Util! ::[${util}]`);
   });
 };
 export const convertUtil = (context, util, registeredUtils) => {
   if (!registeredUtils.hasOwnProperty(util)) return null;
-
   if (typeof registeredUtils[util] === 'string') {
     return {
       type: 'import',
@@ -81,8 +69,9 @@ export const convertUtil = (context, util, registeredUtils) => {
   } else {
     return registeredUtils[util];
   }
-}; // __helpers__
+};
 
+// __helpers__
 export const getImportStatements = (list, filepath) => {
   // swap helpers with helpers file...
   const modifiedImports = list.map(imp => {
@@ -92,49 +81,41 @@ export const getImportStatements = (list, filepath) => {
         path: getRelativePath(filepath, `./${name}`)
       });
     }
-
     return imp;
   });
   const imports = modifiedImports.reduce((m, obj) => {
     m[obj.path] = m[obj.path] || [];
-    const exists = m[obj.path].find(el => el.type === obj.type && el.path === obj.path && el.name === obj.name); // MARKED AS NOT DRY [google.protobuf names]
-    // TODO some have google.protobuf.Any shows up... figure out the better way to handle this
+    const exists = m[obj.path].find(el => el.type === obj.type && el.path === obj.path && el.name === obj.name);
 
+    // MARKED AS NOT DRY [google.protobuf names]
+    // TODO some have google.protobuf.Any shows up... figure out the better way to handle this
     if (/\./.test(obj.name)) {
       obj.name = obj.name.split('.')[obj.name.split('.').length - 1];
     }
-
     if (!exists) {
       m[obj.path].push(obj);
     }
-
     return m;
   }, {});
   return Object.entries(imports).reduce((m, [importPath, imports]) => {
     const defaultImports = imports.filter(a => a.type === 'default');
-
     if (defaultImports.length) {
       if (defaultImports.length > 1) throw new Error('more than one default name NOT allowed.');
       m.push(t.importDeclaration([t.importDefaultSpecifier(t.identifier(defaultImports[0].name))], t.stringLiteral(defaultImports[0].path)));
     }
-
     const namedImports = imports.filter(a => a.type === 'import' && (!a.importAs || a.name === a.importAs));
-
     if (namedImports.length) {
       m.push(importStmt(namedImports.map(i => i.name), namedImports[0].path));
     }
-
     const aliasNamedImports = imports.filter(a => a.type === 'import' && a.importAs && a.name !== a.importAs);
     aliasNamedImports.forEach(imp => {
       m.push(importAs(imp.name, imp.importAs, imp.path));
     });
     const namespaced = imports.filter(a => a.type === 'namespace');
-
     if (namespaced.length) {
       if (namespaced.length > 1) throw new Error('more than one namespaced name NOT allowed.');
       m.push(t.importDeclaration([t.importNamespaceSpecifier(t.identifier(namespaced[0].name))], t.stringLiteral(namespaced[0].path)));
     }
-
     return m;
   }, []);
 };

package/module/index.js

@@ -5,5 +5,5 @@ export * from './recoil';
 export * from './message-composer';
 export * from './react-query';
 export * from './types';
-export * from './msg-builder';
+export * from './message-builder';
 export * from './provider';

package/module/message-builder/index.js

@@ -0,0 +1 @@
+export * from './message-builder';

package/module/{msg-builder/msg-builder.js → message-builder/message-builder.js}

@@ -3,45 +3,50 @@ import { camel } from 'case';
 import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
 import { createTypedObjectParams } from '../utils/types';
 import { getWasmMethodArgs } from '../client/client';
-export const createMsgBuilderClass = (context, className, msg) => {
+export const createMessageBuilderClass = (context, className, msg) => {
   const staticMethods = getMessageProperties(msg).map(schema => {
-    return createStaticExecMethodMsgBuilder(context, schema, msg.title);
-  }); // const blockStmt = bindings;
+    return createStaticExecMethodMessageBuilder(context, schema, msg.title);
+  });
+
+  // const blockStmt = bindings;
 
   return t.exportNamedDeclaration(abstractClassDeclaration(className, staticMethods, [], null));
 };
+
 /**
  * CamelCasedProperties<Extract<ExecuteMsg, { exec_on_module: unknown }>['exec_on_module']>
  */
-
 function createExtractTypeAnnotation(underscoreName, msgTitle) {
   return t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CamelCasedProperties'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier('Extract'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(msgTitle)), t.tsTypeLiteral([t.tsPropertySignature(t.identifier(underscoreName), t.tsTypeAnnotation(t.tsUnknownKeyword()))])])), t.tsLiteralType(t.stringLiteral(underscoreName)))])));
 }
-
-const createStaticExecMethodMsgBuilder = (context, jsonschema, msgTitle) => {
+const createStaticExecMethodMessageBuilder = (context, jsonschema, msgTitle) => {
   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
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
 
+  // what the underscore named property in the message is assigned to
   let actionValue;
-
   if (param?.type === 'Identifier') {
     actionValue = t.identifier(param.name);
   } else {
     actionValue = t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')));
-  } // TODO: this is a hack to get the type annotation to work
-  // all type annotations in the future should be the extracted and camelized type
-
+  }
 
+  // TODO: this is a hack to get the type annotation to work
+  // all type annotations in the future should be the extracted and camelized type
   if (param && param.typeAnnotation.type === 'TSTypeAnnotation' && param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral') {
     param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
   }
-
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression( // params
-  param ? [// props
-  param] : [], // body
-  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)]))]), // return type
-  t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))), false), null, null, false, // static
+  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(
+  // params
+  param ? [
+  // props
+  param] : [],
+  // body
+  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)]))]),
+  // return type
+  t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))), false), null, null, false,
+  // static
   true);
 };

package/module/{msg-builder/msg-builder.spec.js → message-builder/message-builder.spec.js}

@@ -1,17 +1,17 @@
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import ownership from '../../../../__fixtures__/basic/ownership.json';
-import { createMsgBuilderClass } from './msg-builder';
+import { createMessageBuilderClass } from './message-builder';
 import { expectCode, makeContext } from '../../test-utils';
 it('execute class', () => {
   const ctx = makeContext(execute_msg);
-  expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', execute_msg));
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', execute_msg));
 });
 it('query class', () => {
   const ctx = makeContext(query_msg);
-  expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', query_msg));
+  expectCode(createMessageBuilderClass(ctx, 'SG721MessageBuilder', query_msg));
 });
 it('ownership', () => {
   const ctx = makeContext(ownership);
-  expectCode(createMsgBuilderClass(ctx, 'Ownership', ownership));
+  expectCode(createMessageBuilderClass(ctx, 'Ownership', ownership));
 });

package/module/message-composer/message-composer.js

@@ -3,7 +3,6 @@ import { camel } from 'case';
 import { arrowFunctionExpression, bindMethod, classDeclaration, classProperty, getMessageProperties, OPTIONAL_FUNDS_PARAM, typedIdentifier } from '../utils';
 import { createTypedObjectParams } from '../utils/types';
 import { getWasmMethodArgs } from '../client/client';
-
 const createWasmExecMethodMessageComposer = (context, jsonschema) => {
   context.addUtil('Coin');
   context.addUtil('MsgExecuteContractEncodeObject');
@@ -12,22 +11,22 @@ const createWasmExecMethodMessageComposer = (context, jsonschema) => {
   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
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
 
+  // what the underscore named property in the message is assigned to
   let actionValue;
-
   if (param?.type === 'Identifier') {
     actionValue = t.identifier(param.name);
   } else {
     actionValue = t.objectExpression(args);
   }
-
   const constantParams = [OPTIONAL_FUNDS_PARAM];
-  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.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
+  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.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));
 };
-
 export const createMessageComposerClass = (context, className, implementsClassName, execMsg) => {
   const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
@@ -36,9 +35,12 @@ export const createMessageComposerClass = (context, className, implementsClassNa
   });
   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]);
-  return t.exportNamedDeclaration(classDeclaration(className, [// sender
-  classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
+  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));
 };
 export const createMessageComposerInterface = (context, className, execMsg) => {
@@ -48,11 +50,12 @@ export const createMessageComposerInterface = (context, className, execMsg) => {
     return createPropertyFunctionWithObjectParamsForMessageComposer(context, methodName, 'MsgExecuteContractEncodeObject', jsonschema.properties[underscoreName]);
   });
   const extendsAst = [];
-  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
+  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())), ...methods])));
 };
-
 const createPropertyFunctionWithObjectParamsForMessageComposer = (context, methodName, responseType, jsonschema) => {
   const obj = createTypedObjectParams(context, jsonschema);
   const fixedParams = [OPTIONAL_FUNDS_PARAM];
@@ -61,6 +64,7 @@ const createPropertyFunctionWithObjectParamsForMessageComposer = (context, metho
     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
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(
+  // @ts-ignore:next-line
   func));
 };

package/module/provider/provider.js

@@ -9,14 +9,12 @@ export const createProvider = (name, providerInfos) => {
 };
 export const createIContractsContext = providerInfos => {
   const properties = [];
-
   for (const key in providerInfos) {
     if (Object.prototype.hasOwnProperty.call(providerInfos, key)) {
       const contractProviderInfo = providerInfos[key];
       properties.push(createProperty(key, contractProviderInfo));
     }
   }
-
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier("IContractsContext"), null, null, t.tsInterfaceBody(properties)));
 };
 let PROVIDER_MAPPING = {};
@@ -26,28 +24,22 @@ PROVIDER_MAPPING[PROVIDER_TYPES.MESSAGE_COMPOSER_TYPE] = "IMessageComposerProvid
 export const createProperty = (name, providerInfos) => {
   let typeAnnotation = null;
   const keys = Object.keys(providerInfos);
-
   if (keys?.length == 1) {
     const key = keys[0];
     typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(PROVIDER_MAPPING[key]), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(providerInfos[key].classname))])));
   } else {
     const typeRefs = [];
-
     for (const key of keys) {
       typeRefs.push(t.tsTypeReference(t.identifier(PROVIDER_MAPPING[key]), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(providerInfos[key].classname))])));
     }
-
     typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType(typeRefs));
   }
-
   return t.tsPropertySignature(t.identifier(camel(name)), typeAnnotation);
 };
 export const createGettingProviders = providerInfos => {
   const properties = [];
-
   for (const key of Object.keys(providerInfos)) {
     properties.push(t.objectProperty(t.identifier(camel(key)), t.newExpression(t.identifier(pascal(key)), [t.objectExpression([t.objectProperty(t.identifier("address"), t.identifier("address"), false, true), t.objectProperty(t.identifier("cosmWasmClient"), t.identifier("cosmWasmClient"), false, true), t.objectProperty(t.identifier("signingCosmWasmClient"), t.identifier("signingCosmWasmClient"), false, true)])])));
   }
-
   return t.exportNamedDeclaration(t.variableDeclaration("const", [t.variableDeclarator(t.identifier("getProviders"), t.arrowFunctionExpression([identifier("address?", t.tsTypeAnnotation(t.tsTypeReference(t.identifier("string")))), identifier("cosmWasmClient?", t.tsTypeAnnotation(t.tsTypeReference(t.identifier("CosmWasmClient")))), identifier("signingCosmWasmClient?", t.tsTypeAnnotation(t.tsTypeReference(t.identifier("SigningCosmWasmClient"))))], t.objectExpression(properties)))]));
 };