wasm-ast-types 0.24.0 → 0.26.0

package/src/context/context.ts

@@ -6,69 +6,69 @@ import { basename, extname } from 'path'
 
 /// Plugin Types
 export interface ReactQueryOptions {
-    enabled?: boolean;
-    optionalClient?: boolean;
-    version?: 'v3' | 'v4';
-    mutations?: boolean;
-    camelize?: boolean;
-    queryKeys?: boolean
-    queryFactory?: boolean
+  enabled?: boolean;
+  optionalClient?: boolean;
+  version?: 'v3' | 'v4';
+  mutations?: boolean;
+  camelize?: boolean;
+  queryKeys?: boolean
+  queryFactory?: boolean
 }
 
 export interface TSClientOptions {
-    enabled?: boolean;
-    execExtendsQuery?: boolean;
-    noImplicitOverride?: boolean;
+  enabled?: boolean;
+  execExtendsQuery?: boolean;
+  noImplicitOverride?: boolean;
 }
 export interface MessageComposerOptions {
-    enabled?: boolean;
+  enabled?: boolean;
 }
-export interface MsgBuilderOptions {
-    enabled?: boolean;
+export interface MessageBuilderOptions {
+  enabled?: boolean;
 }
 export interface RecoilOptions {
-    enabled?: boolean;
+  enabled?: boolean;
 }
 export interface TSTypesOptions {
-    enabled?: boolean;
-    // deprecated
-    aliasExecuteMsg?: boolean;
-    aliasEntryPoints?: boolean;
+  enabled?: boolean;
+  // deprecated
+  aliasExecuteMsg?: boolean;
+  aliasEntryPoints?: boolean;
 }
 
 /// END Plugin Types
 
 interface KeyedSchema {
-    [key: string]: JSONSchema;
+  [key: string]: JSONSchema;
 }
 export interface IDLObject {
-    contract_name: string;
-    contract_version: string;
-    idl_version: string;
-    instantiate: JSONSchema;
-    execute: JSONSchema;
-    query: JSONSchema;
-    migrate: JSONSchema;
-    sudo: JSONSchema;
-    responses: KeyedSchema;
+  contract_name: string;
+  contract_version: string;
+  idl_version: string;
+  instantiate: JSONSchema;
+  execute: JSONSchema;
+  query: JSONSchema;
+  migrate: JSONSchema;
+  sudo: JSONSchema;
+  responses: KeyedSchema;
 }
 
 export interface ContractInfo {
-    schemas: JSONSchema[];
-    responses?: Record<string, JSONSchema>;
-    idlObject?: IDLObject;
+  schemas: JSONSchema[];
+  responses?: Record<string, JSONSchema>;
+  idlObject?: IDLObject;
 };
 export interface RenderOptions {
-    enabled?: boolean;
-    types?: TSTypesOptions;
-    recoil?: RecoilOptions;
-    messageComposer?: MessageComposerOptions;
-    msgBuilder?: MsgBuilderOptions;
-    client?: TSClientOptions;
-    reactQuery?: ReactQueryOptions;
+  enabled?: boolean;
+  types?: TSTypesOptions;
+  recoil?: RecoilOptions;
+  messageComposer?: MessageComposerOptions;
+  messageBuilder?: MessageBuilderOptions;
+  client?: TSClientOptions;
+  reactQuery?: ReactQueryOptions;
 }
 
-export interface ProviderInfo{
+export interface ProviderInfo {
   classname: string,
   filename: string,
   basename: string,
@@ -81,90 +81,90 @@ export interface IContext {
 }
 
 export interface IRenderContext<TOpt = RenderOptions> extends IContext {
-    contract: ContractInfo;
-    options: TOpt;
-
-    addProviderInfo(contractName:string, type: string, classname: string, filename: string): void;
-    getProviderInfos(): {
-      [key: string]: {
-        [key: string]: ProviderInfo;
-      };
+  contract: ContractInfo;
+  options: TOpt;
+
+  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void;
+  getProviderInfos(): {
+    [key: string]: {
+      [key: string]: ProviderInfo;
     };
+  };
 }
 
 export const defaultOptions: RenderOptions = {
+  enabled: true,
+  types: {
     enabled: true,
-    types: {
-        enabled: true,
-        aliasExecuteMsg: false
-    },
-    client: {
-        enabled: true,
-        execExtendsQuery: true,
-        noImplicitOverride: false,
-    },
-    recoil: {
-        enabled: false
-    },
-    messageComposer: {
-        enabled: false
-    },
-    msgBuilder: {
-      enabled: false,
-    },
-    reactQuery: {
-        enabled: false,
-        optionalClient: false,
-        version: 'v3',
-        mutations: false,
-        camelize: true,
-        queryKeys: false
-    }
+    aliasExecuteMsg: false
+  },
+  client: {
+    enabled: true,
+    execExtendsQuery: true,
+    noImplicitOverride: false,
+  },
+  recoil: {
+    enabled: false
+  },
+  messageComposer: {
+    enabled: false
+  },
+  messageBuilder: {
+    enabled: false,
+  },
+  reactQuery: {
+    enabled: false,
+    optionalClient: false,
+    version: 'v3',
+    mutations: false,
+    camelize: true,
+    queryKeys: false
+  }
 };
 
 export const getDefinitionSchema = (schemas: JSONSchema[]): JSONSchema => {
-    const aggregateSchema = {
-        definitions: {
-            //
-        }
-    };
+  const aggregateSchema = {
+    definitions: {
+      //
+    }
+  };
 
-    schemas.forEach(schema => {
-        schema.definitions = schema.definitions || {};
-        aggregateSchema.definitions = {
-            ...aggregateSchema.definitions,
-            ...schema.definitions
-        };
-    });
+  schemas.forEach(schema => {
+    schema.definitions = schema.definitions || {};
+    aggregateSchema.definitions = {
+      ...aggregateSchema.definitions,
+      ...schema.definitions
+    };
+  });
 
-    return aggregateSchema;
+  return aggregateSchema;
 };
 
-export class BuilderContext{
-    providers:{
-      [key: string]: {
-        [key: string]: ProviderInfo;
-      };
-    } = {};
-
-    addProviderInfo(contractName:string, type: string, classname: string, filename: string): void {
-      if(!this.providers[contractName]){
-        this.providers[contractName] = {}
-      }
-
-      this.providers[contractName][type] = {
-        classname,
-        filename,
-        basename: basename(filename, extname(filename))
-      };
-    }
-    getProviderInfos(): {
-      [key: string]: {
-        [key: string]: ProviderInfo;
-      };
-    }{
-      return this.providers;
+export class BuilderContext {
+  providers: {
+    [key: string]: {
+      [key: string]: ProviderInfo;
+    };
+  } = {};
+
+  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
+    if (!this.providers[contractName]) {
+      this.providers[contractName] = {}
     }
+
+    this.providers[contractName][type] = {
+      classname,
+      filename,
+      basename: basename(filename, extname(filename))
+    };
+  }
+  getProviderInfos(): {
+    [key: string]: {
+      [key: string]: ProviderInfo;
+    };
+  } {
+    return this.providers;
+  }
 }
 
 /**
@@ -173,56 +173,56 @@ export class BuilderContext{
  * @param TOpt option type
  */
 export abstract class RenderContextBase<TOpt = RenderOptions> implements IRenderContext<TOpt> {
-    builderContext: BuilderContext;
-    contract: ContractInfo;
-    utils: string[] = [];
-    schema: JSONSchema;
-    options: TOpt;
-
-    constructor(
-        contract: ContractInfo,
-        options?: TOpt,
-        builderContext?: BuilderContext
-    ) {
-        this.contract = contract;
-        this.schema = getDefinitionSchema(contract.schemas);
-        this.options = this.mergeDefaultOpt(options);
-        this.builderContext = builderContext;
-    }
-    /**
-     * merge options and default options
-     * @param options
-     */
-    abstract mergeDefaultOpt(options: TOpt): TOpt;
-    refLookup($ref: string) {
-      return refLookup($ref, this.schema)
-    }
-    addUtil(util: string) {
-        this.utils[util] = true;
-    }
-    addProviderInfo(contractName:string, type: string, classname: string, filename: string): void {
-        this.builderContext.addProviderInfo(contractName, type, classname, filename);
-    }
-    getProviderInfos(): {
-      [key: string]: {
-        [key: string]: ProviderInfo;
-      };
-    } {
-        return this.builderContext.providers;
-    }
-    getImports(registeredUtils?: UtilMapping, filepath?: string) {
-        return getImportStatements(
-            convertUtilsToImportList(
-                this,
-                Object.keys(this.utils),
-                registeredUtils,
-            ),
-            filepath
-        );
-    }
+  builderContext: BuilderContext;
+  contract: ContractInfo;
+  utils: string[] = [];
+  schema: JSONSchema;
+  options: TOpt;
+
+  constructor(
+    contract: ContractInfo,
+    options?: TOpt,
+    builderContext?: BuilderContext
+  ) {
+    this.contract = contract;
+    this.schema = getDefinitionSchema(contract.schemas);
+    this.options = this.mergeDefaultOpt(options);
+    this.builderContext = builderContext;
+  }
+  /**
+   * merge options and default options
+   * @param options
+   */
+  abstract mergeDefaultOpt(options: TOpt): TOpt;
+  refLookup($ref: string) {
+    return refLookup($ref, this.schema)
+  }
+  addUtil(util: string) {
+    this.utils[util] = true;
+  }
+  addProviderInfo(contractName: string, type: string, classname: string, filename: string): void {
+    this.builderContext.addProviderInfo(contractName, type, classname, filename);
+  }
+  getProviderInfos(): {
+    [key: string]: {
+      [key: string]: ProviderInfo;
+    };
+  } {
+    return this.builderContext.providers;
+  }
+  getImports(registeredUtils?: UtilMapping, filepath?: string) {
+    return getImportStatements(
+      convertUtilsToImportList(
+        this,
+        Object.keys(this.utils),
+        registeredUtils,
+      ),
+      filepath
+    );
+  }
 }
 
-export class RenderContext extends RenderContextBase{
+export class RenderContext extends RenderContextBase {
   mergeDefaultOpt(options: RenderOptions): RenderOptions {
     return deepmerge(defaultOptions, options ?? {});
   }

package/src/index.ts

@@ -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/src/{msg-builder/__snapshots__/msg-builder.spec.ts.snap → message-builder/__snapshots__/message-builder.spec.ts.snap}

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`execute class 1`] = `
-"export abstract class SG721MsgBuilder {
+"export abstract class SG721MessageBuilder {
   static transferNft = ({
     recipient,
     tokenId
@@ -135,7 +135,7 @@ exports[`ownership 1`] = `
 `;
 
 exports[`query class 1`] = `
-"export abstract class SG721MsgBuilder {
+"export abstract class SG721MessageBuilder {
   static ownerOf = ({
     includeExpired,
     tokenId

package/src/message-builder/index.ts

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

package/src/{msg-builder/msg-builder.spec.ts → message-builder/message-builder.spec.ts}

@@ -3,23 +3,22 @@ import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import ownership from '../../../../__fixtures__/basic/ownership.json';
 
 import {
-    createMsgBuilderClass,
-} from './msg-builder'
+  createMessageBuilderClass,
+} from './message-builder'
 import { expectCode, makeContext } from '../../test-utils';
-import { findExecuteMsg } from '@cosmwasm/ts-codegen/src';
 
 it('execute class', () => {
-    const ctx = makeContext(execute_msg);
-    expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', execute_msg))
+  const ctx = makeContext(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/src/{msg-builder/msg-builder.ts → message-builder/message-builder.ts}

@@ -5,15 +5,15 @@ import { ExecuteMsg, QueryMsg } from '../types';
 import { createTypedObjectParams } from '../utils/types';
 import { RenderContext } from '../context';
 import { getWasmMethodArgs } from '../client/client';
-import { Expression, Identifier, PatternLike, TSAsExpression } from '@babel/types';
+import { Expression } from '@babel/types';
 
-export const createMsgBuilderClass = (
+export const createMessageBuilderClass = (
   context: RenderContext,
   className: string,
   msg: ExecuteMsg | QueryMsg
 ): t.ExportNamedDeclaration => {
   const staticMethods = getMessageProperties(msg).map((schema) => {
-    return createStaticExecMethodMsgBuilder(context, schema, msg.title);
+    return createStaticExecMethodMessageBuilder(context, schema, msg.title);
   });
 
   // const blockStmt = bindings;
@@ -50,7 +50,7 @@ function createExtractTypeAnnotation(underscoreName: string, msgTitle: string) {
   );
 }
 
-const createStaticExecMethodMsgBuilder = (
+const createStaticExecMethodMessageBuilder = (
   context: RenderContext,
   jsonschema: any,
   msgTitle: string
@@ -82,7 +82,7 @@ const createStaticExecMethodMsgBuilder = (
     param.typeAnnotation.type === 'TSTypeAnnotation' &&
     param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral'
   ) {
-      param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+    param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
   }
 
   return t.classProperty(

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

@@ -9,7 +9,7 @@ import {
   createReactQueryMutationHooks,
 } from './react-query'
 import { expectCode, makeContext } from '../../test-utils';
-import { createMsgBuilderClass } from '../msg-builder';
+import { createMessageBuilderClass } from '../message-builder';
 
 const execCtx = makeContext(execute_msg);
 const queryCtx = makeContext(query_msg);

package/types/context/context.d.ts

@@ -17,7 +17,7 @@ export interface TSClientOptions {
 export interface MessageComposerOptions {
     enabled?: boolean;
 }
-export interface MsgBuilderOptions {
+export interface MessageBuilderOptions {
     enabled?: boolean;
 }
 export interface RecoilOptions {
@@ -52,7 +52,7 @@ export interface RenderOptions {
     types?: TSTypesOptions;
     recoil?: RecoilOptions;
     messageComposer?: MessageComposerOptions;
-    msgBuilder?: MsgBuilderOptions;
+    messageBuilder?: MessageBuilderOptions;
     client?: TSClientOptions;
     reactQuery?: ReactQueryOptions;
 }

package/types/index.d.ts

@@ -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/types/message-builder/index.d.ts

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

package/types/message-builder/message-builder.d.ts

@@ -0,0 +1,4 @@
+import * as t from '@babel/types';
+import { ExecuteMsg, QueryMsg } from '../types';
+import { RenderContext } from '../context';
+export declare const createMessageBuilderClass: (context: RenderContext, className: string, msg: ExecuteMsg | QueryMsg) => t.ExportNamedDeclaration;

package/module/msg-builder/index.js

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

package/src/msg-builder/index.ts

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

package/types/msg-builder/index.d.ts

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

package/types/msg-builder/msg-builder.d.ts

@@ -1,4 +0,0 @@
-import * as t from '@babel/types';
-import { ExecuteMsg, QueryMsg } from '../types';
-import { RenderContext } from '../context';
-export declare const createMsgBuilderClass: (context: RenderContext, className: string, msg: ExecuteMsg | QueryMsg) => t.ExportNamedDeclaration;